thermokarst/ccdb-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

merge into: thermokarst:master
Branches Tags
thermokarst:master
thermokarst:issue-73
thermokarst:issue-57
thermokarst:mockups
...
pull from: thermokarst:mockups
Branches Tags
thermokarst:master
thermokarst:issue-73
thermokarst:issue-57
thermokarst:mockups
Sign in to create a new pull request.

4 commits
master ... mockups

Author SHA1 Message Date
Matthew Dillon
ffa302298f WIP 2017-09-14 08:07:06 -07:00
Matthew Dillon
408b1bb1d4 WIP 2017-09-14 07:14:57 -07:00
Matthew Dillon
f158d7a7f3 WIP 2017-09-13 14:07:41 -07:00
Matthew Dillon
825b5b0d89 WIP 2017-09-13 06:20:34 -07:00
19 changed files with 497 additions and 2 deletions
Show stats Expand all files Collapse all files

5
app/components/ccdb-pagination.js Normal file
View file

@ -0,0 +1,5 @@
import Ember from 'ember';
export default Ember.Component.extend({
classNames: ['row'],
});

2
app/components/ccdb-table.js
View file

@ -8,6 +8,8 @@ export default Component.extend({
columns: null,
table: null,
classNames: ['row'],
init() {
this._super(...arguments);
const table = new Table(this.get('columns'), this.get('model'));

5
app/components/filter-collections.js Normal file
View file

@ -0,0 +1,5 @@
import Ember from 'ember';
export default Ember.Component.extend({
tagName: 'form',
});

5
app/router.js
View file

@ -9,7 +9,10 @@ const Router = Ember.Router.extend({
Router.map(function() {
this.route('login');
this.route('logout');
this.route('collections');
this.route('collections', function() {
this.route('1');
this.route('new');
});
});
export default Router;

4
app/routes/collections/1.js Normal file
View file

@ -0,0 +1,4 @@
import Ember from 'ember';
export default Ember.Route.extend({
});

0
app/routes/collections.js → app/routes/collections/index.js
View file

4
app/routes/collections/new.js Normal file
View file

@ -0,0 +1,4 @@
import Ember from 'ember';
export default Ember.Route.extend({
});

11
app/styles/app.css
View file

@ -1,3 +1,14 @@
.content {
padding-left: 40px;
padding-right: 40px;
padding-top: 20px;
padding-bottom: 20px;
}
.top-buffer {
padding-top: 20px;
}
.form-signin {
max-width: 330px;
padding: 15px;

147
app/templates/collections/1.hbs Normal file
View file

@ -0,0 +1,147 @@
<h3>Collection Detail</h3>
<div class="row">
<div class="panel panel-default col-md-12">
<div class="panel-body table-responsive">
<table class="table table-border table-hover table-condensed">
<thead>
<tr>
<th>Project</th>
<th>Study Location</th>
<th>Method</th>
<th>Type</th>
<th># of Traps</th>
<th>Start</th>
<th>End</th>
<th>Experiments</th>
</tr>
</thead>
<tbody>
<tr>
<td>Perchlorate</td>
<td>RS</td>
<td>MT</td>
<td>Embryos</td>
<td></td>
<td>2010-06-07</td>
<td>2010-06-07</td>
<td>Perchlorate diel; Perchlorate rescue</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<div class="row">
<div class="panel panel-default col-md-12">
<div class="panel-body">
<ul>
<li><a href="">Attachment 1: Photo</a></li>
<li><a href="">Attachment 2: Field Sheets</a></li>
<li><a href="">Attachment 3: Misc Notes</a></li>
</ul>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<form class="form-inline">
<div class="form-group">
<label>Experiment</label>
<select class="form-control">
<option>All</option>
<option selected=selected>Perchlorate diel</option>
<option>Perchlorate rescue</option>
</select>
</div>
</form>
</div>
</div>
<div class="row top-buffer">
<div class="col-md-12">
<!-- Nav tabs -->
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active"><a href="#treatments" role="tab" data-toggle="tab">Treatments</a></li>
<li role="presentation"><a href="#treatment-replicates" role="tab" data-toggle="tab">Treatment Replicates</a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="treatments">
<table class="table table-border table-hover table-condensed">
<thead>
<tr>
<th>Experiment</th>
<th>Type</th>
<th>Species</th>
<th>Sex</th>
<th>Container</th>
<th>Replicates</th>
<th>Flaw</th>
</tr>
</thead>
<tbody>
<tr>
<td>Perchlorate diel</td>
<td>10 ppm perchlorate, iodide supplemented</td>
<td>Threespine stickleback</td>
<td>Both Sexes</td>
<td>Jar</td>
<td>1; 2; 3</td>
<td></td>
</tr>
<tr>
<td>Perchlorate diel</td>
<td>10 ppm perchlorate, iodide supplemented</td>
<td>Threespine stickleback</td>
<td>Both Sexes</td>
<td>Jar</td>
<td>1; 2; 3</td>
<td></td>
</tr>
<tr>
<td>Perchlorate diel</td>
<td>10 ppm perchlorate, iodide supplemented</td>
<td>Threespine stickleback</td>
<td>Both Sexes</td>
<td>Jar</td>
<td>1; 2; 3</td>
<td></td>
</tr>
<tr>
<td>Perchlorate diel</td>
<td>10 ppm perchlorate, iodide supplemented</td>
<td>Threespine stickleback</td>
<td>Both Sexes</td>
<td>Jar</td>
<td>1; 2; 3</td>
<td></td>
</tr>
<tr>
<td>Perchlorate diel</td>
<td>10 ppm perchlorate, iodide supplemented</td>
<td>Threespine stickleback</td>
<td>Both Sexes</td>
<td>Jar</td>
<td>1; 2; 3</td>
<td></td>
</tr>
<tr>
<td>Perchlorate diel</td>
<td>10 ppm perchlorate, iodide supplemented</td>
<td>Threespine stickleback</td>
<td>Both Sexes</td>
<td>Jar</td>
<td>1; 2; 3</td>
<td></td>
</tr>
</tbody>
</table>
</div>
<div role="tabpanel" class="tab-pane" id="treatment-replicates">...</div>
</div>
</div>
</div>

0
app/templates/collections.hbs → app/templates/collections/index.hbs
View file

130
app/templates/collections/new.hbs Normal file
View file

@ -0,0 +1,130 @@
<form class="form-horizontal">
<div class="form-group">
<label class="col-sm-2 control-label">
Start Date
</label>
<div class="col-sm-10">
<input type="date" class="form-control">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
Start Time
</label>
<div class="col-sm-10">
<input type="date" class="form-control">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
End Date
</label>
<div class="col-sm-10">
<input type="date" class="form-control">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
End Time
</label>
<div class="col-sm-10">
<input type="date" class="form-control">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
Collectors
</label>
<div class="col-sm-10">
<select multiple=true class="form-control">
<option>Frank</option>
<option>Loren</option>
<option>Danielle</option>
<option>Matt</option>
<option>Lauren</option>
<option>Amy</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
Site
</label>
<div class="col-sm-10">
<select class="form-control">
<option>--- Select a Site ---</option>
<option>SQ12</option>
<option>SQ1</option>
<option>SQ3</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
Method
</label>
<div class="col-sm-10">
<select class="form-control">
<option>--- Select a Method ---</option>
<option>MT</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
Type
</label>
<div class="col-sm-10">
<select class="form-control">
<option>--- Select a Type ---</option>
<option>Embryos</option>
<option>Adults</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
# Of Traps
</label>
<div class="col-sm-10">
<input type="text" class="form-control">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
Experiments
</label>
<div class="col-sm-10">
<select multiple=true class="form-control">
<option>Perchlorate diel</option>
<option>Perchlorate rescue</option>
<option>Ship creek monitoring</option>
<option>St Lawrence island monitoring</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
Attachments
</label>
<div class="col-sm-10">
<input type="file">
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-default">Save</button>
</div>
</div>
</form>

36
app/templates/components/ccdb-pagination.hbs Normal file
View file

@ -0,0 +1,36 @@
<div class="col-md-12">
<div class="pull-left" style="padding-top: 26px;">
Showing 1-100 of 102 entries
</div>
<div class="pull-right">
<nav aria-label="Page navigation">
<ul class="pagination">
<li>
<a href="#">
<span aria-hidden="true">First</span>
</a>
</li>
<li>
<a href="#">
<span aria-hidden="true">Previous</span>
</a>
</li>
<li><a href="#">1</a></li>
<li><a href="#">2</a></li>
<li><a href="#">3</a></li>
<li><a href="#">4</a></li>
<li><a href="#">5</a></li>
<li>
<a href="#">
<span aria-hidden="true">Next</span>
</a>
</li>
<li>
<a href="#">
<span aria-hidden="true">Last</span>
</a>
</li>
</ul>
</nav>
</div>
</div>

4
app/templates/components/collections-container.hbs
View file

@ -1 +1,5 @@
{{#link-to "collections.new" class="btn btn-default"}}New Collection{{/link-to}}
<hr>
{{filter-collections}}
{{ccdb-pagination}}
{{ccdb-table model=model columns=columns}}

73
app/templates/components/filter-collections.hbs Normal file
View file

@ -0,0 +1,73 @@
<div class="well well-sm">
<div class="row">
<div class="col-md-3">
<label>Project</label>
<select class="form-control">
<option selected=selected>Perchlorate</option>
<option>Ship Creek</option>
<option>St. Lawrence Island</option>
</select>
</div>
<div class="col-md-3">
<label>Study Location</label>
<select class="form-control">
<option selected=selected>TL5</option>
<option>SQ12</option>
<option>CPISBV</option>
</select>
</div>
<div class="col-md-3">
<label>Method</label>
<select class="form-control">
<option selected=selected>Fyke Net</option>
<option>Seine</option>
<option>Minnow Trap</option>
</select>
</div>
<div class="col-md-3">
<label>Type</label>
<select class="form-control">
<option selected=selected>Adults</option>
<option>Embryos</option>
</select>
</div>
</div>
<div class="row top-buffer">
<div class="col-md-4">
<label># of Traps</label>
<input type="text" class="form-control" placeholder="3">
</div>
<div class="col-md-4">
<label>Start</label>
<input type="datetime" class="form-control">
</div>
<div class="col-md-4">
<label>End</label>
<input type="datetime" class="form-control">
</div>
</div>
<div class="row top-buffer">
<div class="col-md-12">
<div class="btn-group" role="group">
<button type="submit" class="btn btn-default">
Search
</button>
<button type="button" class="btn btn-default">
Reset
</button>
</div>
</div>
</div>
</div>

1
ember-cli-build.js
View file

@ -11,7 +11,6 @@ module.exports = function(defaults) {
});
app.import('bower_components/bootstrap/dist/css/bootstrap.min.css');
app.import('bower_components/bootstrap/dist/css/bootstrap-theme.min.css');
return app.toTree();
};

25
tests/integration/components/ccdb-pagination-test.js Normal file
View file

@ -0,0 +1,25 @@
import { moduleForComponent, test } from 'ember-qunit';
import hbs from 'htmlbars-inline-precompile';
moduleForComponent('ccdb-pagination', 'Integration | Component | ccdb pagination', {
integration: true
});
test('it renders', function(assert) {
// Set any properties with this.set('myProperty', 'value');
// Handle any actions with this.on('myAction', function(val) { ... });
this.render(hbs`{{ccdb-pagination}}`);
assert.equal(this.$().text().trim(), '');
// Template block usage:
this.render(hbs`
{{#ccdb-pagination}}
template block text
{{/ccdb-pagination}}
`);
assert.equal(this.$().text().trim(), 'template block text');
});

25
tests/integration/components/filter-collections-test.js Normal file
View file

@ -0,0 +1,25 @@
import { moduleForComponent, test } from 'ember-qunit';
import hbs from 'htmlbars-inline-precompile';
moduleForComponent('filter-collections', 'Integration | Component | filter collections', {
integration: true
});
test('it renders', function(assert) {
// Set any properties with this.set('myProperty', 'value');
// Handle any actions with this.on('myAction', function(val) { ... });
this.render(hbs`{{filter-collections}}`);
assert.equal(this.$().text().trim(), '');
// Template block usage:
this.render(hbs`
{{#filter-collections}}
template block text
{{/filter-collections}}
`);
assert.equal(this.$().text().trim(), 'template block text');
});

11
tests/unit/routes/collections/1-test.js Normal file
View file

@ -0,0 +1,11 @@
import { moduleFor, test } from 'ember-qunit';
moduleFor('route:collections/1', 'Unit | Route | collections/1', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
test('it exists', function(assert) {
let route = this.subject();
assert.ok(route);
});

11
tests/unit/routes/collections/new-test.js Normal file
View file

@ -0,0 +1,11 @@
import { moduleFor, test } from 'ember-qunit';
moduleFor('route:collections/new', 'Unit | Route | collections/new', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
test('it exists', function(assert) {
let route = this.subject();
assert.ok(route);
});