From f5a589594e1d481a53e1e6127f13574a3f147261 Mon Sep 17 00:00:00 2001 From: Chase Clettenberg Date: Sat, 7 May 2016 22:12:37 -0500 Subject: [PATCH] Add requesting clinician to Labs --- .../labs-completed-list-item/component.js | 6 ++++++ .../labs-completed-list-item/template.hbs | 7 +++++++ app/labs/completed/template.hbs | 10 ++-------- app/labs/edit/template.hbs | 4 ++++ app/labs/index/labs-edit-button/component.js | 6 ++++++ app/labs/index/labs-edit-button/template.hbs | 1 + app/labs/index/labs-list-item/component.js | 10 ++++++++++ app/labs/index/labs-list-item/template.hbs | 12 ++++++++++++ app/labs/index/template.hbs | 19 ++++++------------- app/styles/app.scss | 1 + app/styles/components/_labs.scss | 2 ++ 11 files changed, 57 insertions(+), 21 deletions(-) create mode 100644 app/labs/completed/labs-completed-list-item/component.js create mode 100644 app/labs/completed/labs-completed-list-item/template.hbs create mode 100644 app/labs/index/labs-edit-button/component.js create mode 100644 app/labs/index/labs-edit-button/template.hbs create mode 100644 app/labs/index/labs-list-item/component.js create mode 100644 app/labs/index/labs-list-item/template.hbs create mode 100644 app/styles/components/_labs.scss diff --git a/app/labs/completed/labs-completed-list-item/component.js b/app/labs/completed/labs-completed-list-item/component.js new file mode 100644 index 0000000000..1def2a49a4 --- /dev/null +++ b/app/labs/completed/labs-completed-list-item/component.js @@ -0,0 +1,6 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + tagName: 'tr', + classNames: ['completed-labs-row'] +}); diff --git a/app/labs/completed/labs-completed-list-item/template.hbs b/app/labs/completed/labs-completed-list-item/template.hbs new file mode 100644 index 0000000000..525e461794 --- /dev/null +++ b/app/labs/completed/labs-completed-list-item/template.hbs @@ -0,0 +1,7 @@ +{{date-format lab.requestedDate}} +{{date-format lab.labDate}} +{{lab.patient.displayName}} +{{lab.requestedBy}} +{{lab.labType.name}} +{{lab.result}} +{{lab.notes}} diff --git a/app/labs/completed/template.hbs b/app/labs/completed/template.hbs index fe59777530..8c65fce917 100644 --- a/app/labs/completed/template.hbs +++ b/app/labs/completed/template.hbs @@ -5,19 +5,13 @@ {{t 'labels.date_requested'}} {{t 'labels.date_completed'}} {{t 'labels.patient'}} + {{t 'labels.requested_by'}} {{t 'labs.labels.lab_type'}} {{t 'labels.results'}} {{t 'labels.notes'}} {{#each model as |lab|}} - - {{date-format lab.requestedDate}} - {{date-format lab.labDate}} - {{lab.patient.displayName}} - {{lab.labType.name}} - {{lab.result}} - {{lab.notes}} - + {{labs/completed/labs-completed-list-item lab=lab}} {{/each}} {{else}} diff --git a/app/labs/edit/template.hbs b/app/labs/edit/template.hbs index 9d5236acfe..0de4e46f6f 100644 --- a/app/labs/edit/template.hbs +++ b/app/labs/edit/template.hbs @@ -33,6 +33,10 @@

{{model.labType.name}}

+
+ +

{{model.requestedBy}}

+
{{/if}} {{#if canComplete}} diff --git a/app/labs/index/labs-edit-button/component.js b/app/labs/index/labs-edit-button/component.js new file mode 100644 index 0000000000..f4f9589c8a --- /dev/null +++ b/app/labs/index/labs-edit-button/component.js @@ -0,0 +1,6 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + tagName: 'button', + classNames: ['btn', 'btn-default', 'neutral'] +}); diff --git a/app/labs/index/labs-edit-button/template.hbs b/app/labs/index/labs-edit-button/template.hbs new file mode 100644 index 0000000000..5be97d62f0 --- /dev/null +++ b/app/labs/index/labs-edit-button/template.hbs @@ -0,0 +1 @@ +{{#link-to 'labs.edit' lab}}{{t 'labels.edit'}}{{/link-to}} diff --git a/app/labs/index/labs-list-item/component.js b/app/labs/index/labs-list-item/component.js new file mode 100644 index 0000000000..85b7b4773b --- /dev/null +++ b/app/labs/index/labs-list-item/component.js @@ -0,0 +1,10 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + tagName: 'tr', + classNames: ['clickable', 'labs-row'], + + click() { + this.sendAction('action', this.lab); + } +}); diff --git a/app/labs/index/labs-list-item/template.hbs b/app/labs/index/labs-list-item/template.hbs new file mode 100644 index 0000000000..cb5ab5642a --- /dev/null +++ b/app/labs/index/labs-list-item/template.hbs @@ -0,0 +1,12 @@ +{{date-format lab.requestedDate}} +{{lab.patient.displayName}} +{{lab.requestedBy}} +{{lab.labType.name}} +{{lab.notes}} + {{#if showActions}} + + {{#if canEdit}} + {{labs/index/labs-edit-button lab=lab}} + {{/if}} + +{{/if}} diff --git a/app/labs/index/template.hbs b/app/labs/index/template.hbs index 48ca962590..919fd8decf 100644 --- a/app/labs/index/template.hbs +++ b/app/labs/index/template.hbs @@ -4,6 +4,7 @@ {{t 'labels.date_requested'}} {{t 'labels.patient'}} + {{t 'labels.requested_by'}} {{t 'labs.labels.lab_type'}} {{t 'labels.notes'}} {{#if showActions}} @@ -11,19 +12,11 @@ {{/if}} {{#each model as |lab|}} - - {{date-format lab.requestedDate}} - {{lab.patient.displayName}} - {{lab.labType.name}} - {{lab.notes}} - {{#if showActions}} - - {{#if canEdit}} - - {{/if}} - - {{/if}} - + {{labs/index/labs-list-item + lab=lab + action='editItem' + showActions=showActions + canEdit=canEdit}} {{/each}} {{else}} diff --git a/app/styles/app.scss b/app/styles/app.scss index e08a4a9aa8..d4c2f80dbc 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -18,6 +18,7 @@ @import 'components/tab_content'; @import 'components/patient_summary'; @import 'components/patient_history'; +@import 'components/labs'; // NOTE: do not place styles in this file // If you have styles to add, put them in diff --git a/app/styles/components/_labs.scss b/app/styles/components/_labs.scss new file mode 100644 index 0000000000..095fcdb041 --- /dev/null +++ b/app/styles/components/_labs.scss @@ -0,0 +1,2 @@ +.labs-row .notes { max-width: 300px; } +.completed-labs-row .notes { max-width: 300px; }