diff --git a/app/components/ccdb-table.js b/app/components/ccdb-table.js new file mode 100644 index 0000000..328b9d3 --- /dev/null +++ b/app/components/ccdb-table.js @@ -0,0 +1,16 @@ +import Ember from 'ember'; +import Table from 'ember-light-table'; + +const { Component } = Ember; + +export default Component.extend({ + model: null, + columns: null, + table: null, + + init() { + this._super(...arguments); + const table = new Table(this.get('columns'), this.get('model')); + this.set('table', table); + }, +}); diff --git a/app/components/collections-container.js b/app/components/collections-container.js new file mode 100644 index 0000000..376c977 --- /dev/null +++ b/app/components/collections-container.js @@ -0,0 +1,15 @@ +import Ember from 'ember'; + +const { Component } = Ember; + +export default Component.extend({ + columns: [ + { label: 'Project', valuePath: 'project.name', }, + { label: 'Study Location', valuePath: 'studyLocation.code', }, + { label: 'Method', valuePath: 'collectionMethod.code', }, + { label: 'Type', valuePath: 'collectionType.name', }, + { label: '# of Traps', valuePath: 'numberOfTraps', }, + { label: 'Start', valuePath: 'startDateTime', }, + { label: 'End', valuePath: 'endDateTime', }, + ], +}); diff --git a/app/components/loading-spinner.js b/app/components/loading-spinner.js new file mode 100644 index 0000000..f65d12f --- /dev/null +++ b/app/components/loading-spinner.js @@ -0,0 +1,7 @@ +import Ember from 'ember'; + +const { Component } = Ember; + +export default Component.extend({ + classNames: ['spinner'], +}); diff --git a/app/models/collection-method.js b/app/models/collection-method.js new file mode 100644 index 0000000..fcfd900 --- /dev/null +++ b/app/models/collection-method.js @@ -0,0 +1,10 @@ +import DS from 'ember-data'; + +const { Model, attr } = DS; + +export default Model.extend({ + name: attr('string'), + code: attr('string'), + collectionMethodClass: attr('string'), + sortOrder: attr('number'), +}); diff --git a/app/models/collection-type.js b/app/models/collection-type.js new file mode 100644 index 0000000..1dff4b5 --- /dev/null +++ b/app/models/collection-type.js @@ -0,0 +1,9 @@ +import DS from 'ember-data'; + +const { Model, attr } = DS; + +export default Model.extend({ + name: attr('string'), + code: attr('string'), + sortOrder: attr('number'), +}); diff --git a/app/models/collection.js b/app/models/collection.js new file mode 100644 index 0000000..c2fc7c9 --- /dev/null +++ b/app/models/collection.js @@ -0,0 +1,31 @@ +import Ember from 'ember'; +import DS from 'ember-data'; + +const { computed } = Ember; +const { Model, attr, belongsTo } = DS; + +export default Model.extend({ + displayName: attr('string'), + numberOfTraps: attr('number'), + collectionStartDate: attr('string-null-to-empty'), + collectionStartTime: attr('string-null-to-empty'), + collectionEndDate: attr('string-null-to-empty'), + collectionEndTime: attr('string-null-to-empty'), + + project: belongsTo('project'), + studyLocation: belongsTo('study-location'), + collectionMethod: belongsTo('collection-method'), + collectionType: belongsTo('collection-type'), + + startDateTime: computed('collectionStartDate', 'collectionStartTime', + function() { return this._mergeDateTime('Start'); }), + + endDateTime: computed('collectionEndDate', 'collectionEndTime', + function() { return this._mergeDateTime('End'); }), + + _mergeDateTime(timepoint) { + const date = this.get(`collection${timepoint}Date`); + const time = this.get(`collection${timepoint}Time`); + return `${date} ${time}`.trim(); + }, +}); diff --git a/app/models/project.js b/app/models/project.js new file mode 100644 index 0000000..55d586c --- /dev/null +++ b/app/models/project.js @@ -0,0 +1,11 @@ +import DS from 'ember-data'; + +const { Model, attr } = DS; + +export default Model.extend({ + name: attr('string'), + code: attr('string'), + iacucNumber: attr('string'), + description: attr('string'), + sortOrder: attr('number'), +}); diff --git a/app/models/study-location.js b/app/models/study-location.js new file mode 100644 index 0000000..7568218 --- /dev/null +++ b/app/models/study-location.js @@ -0,0 +1,13 @@ +import DS from 'ember-data'; + +const { Model, attr } = DS; + +export default Model.extend({ + name: attr('string'), + code: attr('string'), + studyLocationType: attr('string'), + treatmentType: attr('string'), + collectingLocation: attr('string'), + description: attr('string'), + sortOrder: attr('number'), +}); diff --git a/app/router.js b/app/router.js index 6f5bc57..3234f26 100644 --- a/app/router.js +++ b/app/router.js @@ -9,6 +9,7 @@ const Router = Ember.Router.extend({ Router.map(function() { this.route('login'); this.route('logout'); + this.route('collections'); }); export default Router; diff --git a/app/routes/collections.js b/app/routes/collections.js new file mode 100644 index 0000000..9b3a78a --- /dev/null +++ b/app/routes/collections.js @@ -0,0 +1,11 @@ +import Ember from 'ember'; + +const { Route } = Ember; + +export default Route.extend({ + model() { + return this.get('store').findAll('collection', { + include: 'project,study-location,collection-method,collection-type' + }); + } +}); diff --git a/app/styles/app.css b/app/styles/app.css index 8edec44..1a8070d 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -72,3 +72,45 @@ background-color: #428bca; } +/* Spinkit http://tobiasahlin.com/spinkit/ */ +.spinner { + margin: 100px auto 0; + width: 70px; + text-align: center; +} + +.spinner > div { + width: 18px; + height: 18px; + background-color: #333; + + border-radius: 100%; + display: inline-block; + -webkit-animation: sk-bouncedelay 1.4s infinite ease-in-out both; + animation: sk-bouncedelay 1.4s infinite ease-in-out both; +} + +.spinner .bounce1 { + -webkit-animation-delay: -0.32s; + animation-delay: -0.32s; +} + +.spinner .bounce2 { + -webkit-animation-delay: -0.16s; + animation-delay: -0.16s; +} + +@-webkit-keyframes sk-bouncedelay { + 0%, 80%, 100% { -webkit-transform: scale(0) } + 40% { -webkit-transform: scale(1.0) } +} + +@keyframes sk-bouncedelay { + 0%, 80%, 100% { + -webkit-transform: scale(0); + transform: scale(0); + } 40% { + -webkit-transform: scale(1.0); + transform: scale(1.0); + } +} diff --git a/app/templates/application.hbs b/app/templates/application.hbs index 73e6c1b..28f30f7 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -3,15 +3,19 @@
-
+
{{outlet}}
diff --git a/app/templates/collections.hbs b/app/templates/collections.hbs new file mode 100644 index 0000000..f91170d --- /dev/null +++ b/app/templates/collections.hbs @@ -0,0 +1 @@ +{{collections-container model=model}} diff --git a/app/templates/components/ccdb-table.hbs b/app/templates/components/ccdb-table.hbs new file mode 100644 index 0000000..2d95f07 --- /dev/null +++ b/app/templates/components/ccdb-table.hbs @@ -0,0 +1,10 @@ +{{#if hasBlock}} + {{yield (hash + table=(component 'light-table' table=table) + )}} +{{else}} + {{#light-table table tableClassNames="table table-striped" as |t|}} + {{t.head}} + {{t.body}} + {{/light-table}} +{{/if}} diff --git a/app/templates/components/collections-container.hbs b/app/templates/components/collections-container.hbs new file mode 100644 index 0000000..b6a7d07 --- /dev/null +++ b/app/templates/components/collections-container.hbs @@ -0,0 +1 @@ +{{ccdb-table model=model columns=columns}} diff --git a/app/templates/components/loading-spinner.hbs b/app/templates/components/loading-spinner.hbs new file mode 100644 index 0000000..91710ce --- /dev/null +++ b/app/templates/components/loading-spinner.hbs @@ -0,0 +1,3 @@ +
+
+
diff --git a/app/templates/loading.hbs b/app/templates/loading.hbs new file mode 100644 index 0000000..7b99811 --- /dev/null +++ b/app/templates/loading.hbs @@ -0,0 +1 @@ +{{loading-spinner}} diff --git a/app/transforms/string-null-to-empty.js b/app/transforms/string-null-to-empty.js new file mode 100644 index 0000000..0836575 --- /dev/null +++ b/app/transforms/string-null-to-empty.js @@ -0,0 +1,13 @@ +import DS from 'ember-data'; + +const { Transform } = DS; + +export default Transform.extend({ + deserialize(serialized) { + return serialized || ''; + }, + + serialize(deserialized) { + return deserialized; + } +}); diff --git a/tests/integration/.gitkeep b/tests/integration/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/tests/unit/models/collection-method-test.js b/tests/unit/models/collection-method-test.js new file mode 100644 index 0000000..d772a1d --- /dev/null +++ b/tests/unit/models/collection-method-test.js @@ -0,0 +1,12 @@ +import { moduleForModel, test } from 'ember-qunit'; + +moduleForModel('collection-method', 'Unit | Model | collection method', { + // Specify the other units that are required for this test. + needs: [] +}); + +test('it exists', function(assert) { + let model = this.subject(); + // let store = this.store(); + assert.ok(!!model); +}); diff --git a/tests/unit/models/collection-test.js b/tests/unit/models/collection-test.js new file mode 100644 index 0000000..28385b1 --- /dev/null +++ b/tests/unit/models/collection-test.js @@ -0,0 +1,12 @@ +import { moduleForModel, test } from 'ember-qunit'; + +moduleForModel('collection', 'Unit | Model | collection', { + // Specify the other units that are required for this test. + needs: [] +}); + +test('it exists', function(assert) { + let model = this.subject(); + // let store = this.store(); + assert.ok(!!model); +}); diff --git a/tests/unit/models/collection-type-test.js b/tests/unit/models/collection-type-test.js new file mode 100644 index 0000000..beb4cf2 --- /dev/null +++ b/tests/unit/models/collection-type-test.js @@ -0,0 +1,12 @@ +import { moduleForModel, test } from 'ember-qunit'; + +moduleForModel('collection-type', 'Unit | Model | collection type', { + // Specify the other units that are required for this test. + needs: [] +}); + +test('it exists', function(assert) { + let model = this.subject(); + // let store = this.store(); + assert.ok(!!model); +}); diff --git a/tests/unit/models/project-test.js b/tests/unit/models/project-test.js new file mode 100644 index 0000000..2dddcd6 --- /dev/null +++ b/tests/unit/models/project-test.js @@ -0,0 +1,12 @@ +import { moduleForModel, test } from 'ember-qunit'; + +moduleForModel('project', 'Unit | Model | project', { + // Specify the other units that are required for this test. + needs: [] +}); + +test('it exists', function(assert) { + let model = this.subject(); + // let store = this.store(); + assert.ok(!!model); +}); diff --git a/tests/unit/models/study-location-test.js b/tests/unit/models/study-location-test.js new file mode 100644 index 0000000..406258a --- /dev/null +++ b/tests/unit/models/study-location-test.js @@ -0,0 +1,12 @@ +import { moduleForModel, test } from 'ember-qunit'; + +moduleForModel('study-location', 'Unit | Model | study location', { + // Specify the other units that are required for this test. + needs: [] +}); + +test('it exists', function(assert) { + let model = this.subject(); + // let store = this.store(); + assert.ok(!!model); +}); diff --git a/tests/unit/routes/collections-test.js b/tests/unit/routes/collections-test.js new file mode 100644 index 0000000..5bf1e5d --- /dev/null +++ b/tests/unit/routes/collections-test.js @@ -0,0 +1,10 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:collections', 'Unit | Route | collections', { + unit: true, +}); + +test('it exists', function(assert) { + const route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/transforms/string-null-to-empty-test.js b/tests/unit/transforms/string-null-to-empty-test.js new file mode 100644 index 0000000..ebb1ae6 --- /dev/null +++ b/tests/unit/transforms/string-null-to-empty-test.js @@ -0,0 +1,12 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('transform:string-null-to-empty', 'Unit | Transform | string null to empty', { + // Specify the other units that are required for this test. + // needs: ['serializer:foo'] +}); + +// Replace this with your real tests. +test('it exists', function(assert) { + let transform = this.subject(); + assert.ok(transform); +});