From db4e77fb62be9f77f04ae03cb33dfe7fc163aef1 Mon Sep 17 00:00:00 2001
From: Darin Swanson <dswanson@newrelic.com>
Date: Wed, 16 Mar 2016 12:38:09 -0700
Subject: [PATCH 1/2] Removed all the subActions (sub nav links) and updated
 styling to match

addresses #361
---
 app/admin/route.js                | 22 +---------------------
 app/appointments/route.js         | 11 -----------
 app/imaging/route.js              | 15 +--------------
 app/inventory/route.js            | 10 ----------
 app/labs/route.js                 |  9 +--------
 app/medication/route.js           | 11 -----------
 app/patients/route.js             | 10 +---------
 app/styles/_bootstrap-theme.scss  |  2 --
 app/styles/_variables_mixins.scss |  1 +
 app/templates/section.hbs         |  6 ++----
 10 files changed, 7 insertions(+), 90 deletions(-)

diff --git a/app/admin/route.js b/app/admin/route.js
index ce6c9cdac1..6b44a03950 100644
--- a/app/admin/route.js
+++ b/app/admin/route.js
@@ -4,27 +4,7 @@ export default AbstractModuleRoute.extend({
   allowSearch: false,
   moduleName: 'admin',
   sectionTitle: 'Admin',
-  subActions: function() {
-    var options = [{
-      text: this.get('i18n').t('admin.address_options'),
-      linkTo: 'admin.address'
-    }, {
-      text: this.get('i18n').t('admin.lookup_lists'),
-      linkTo: 'admin.lookup'
-    }];
-    if (this.currentUserCan('load_db')) {
-      options.push({
-        text: this.get('i18n').t('admin.load_db'),
-        linkTo: 'admin.loaddb'
-      });
-    }
-    options.push({
-      text: this.get('i18n').t('admin.users'),
-      linkTo: 'users.index'
-    });
-    return options;
-  }.property(),
-
+  
   editPath: function() {
     return 'users.edit';
   }.property(),
diff --git a/app/appointments/route.js b/app/appointments/route.js
index 0000df0c6b..4cc8ef0299 100644
--- a/app/appointments/route.js
+++ b/app/appointments/route.js
@@ -32,16 +32,5 @@ export default AbstractModuleRoute.extend(UserSession, {
   }, {
     name: 'visitTypesList',
     findArgs: ['lookup', 'visit_types']
-  }],
-
-  subActions: [{
-    text: 'This Week',
-    linkTo: 'appointments.index'
-  }, {
-    text: 'Today',
-    linkTo: 'appointments.today'
-  }, {
-    text: 'Search',
-    linkTo: 'appointments.search'
   }]
 });
diff --git a/app/imaging/route.js b/app/imaging/route.js
index 4b5cd4f24b..3f4f8640c1 100644
--- a/app/imaging/route.js
+++ b/app/imaging/route.js
@@ -12,18 +12,5 @@ export default AbstractModuleRoute.extend({
   allowSearch: false,
   moduleName: 'imaging',
   newButtonText: t('imaging.buttons.new_button'),
-  sectionTitle: t('imaging.section_title'),
-  subActions: function() {
-    let i18n = this.get('i18n');
-
-    return [{
-      text: i18n.t('labels.requests'),
-      linkTo: 'imaging.index'
-    }, {
-      text: i18n.t('labels.completed'),
-      linkTo: 'imaging.completed'
-    }];
-
-  }.property()
-
+  sectionTitle: t('imaging.section_title')
 });
diff --git a/app/inventory/route.js b/app/inventory/route.js
index a6601b7743..e90cc050a0 100644
--- a/app/inventory/route.js
+++ b/app/inventory/route.js
@@ -38,16 +38,6 @@ export default AbstractModuleRoute.extend(FulfillRequest, InventoryId, Inventory
   moduleName: 'inventory',
 
   newButtonText: '+ new request',
-  subActions: [{
-    text: 'Requests',
-    linkTo: 'inventory.index'
-  }, {
-    text: 'Items',
-    linkTo: 'inventory.listing'
-  }, {
-    text: 'Reports',
-    linkTo: 'inventory.reports'
-  }],
   sectionTitle: 'Inventory',
 
   actions: {
diff --git a/app/labs/route.js b/app/labs/route.js
index 321a5e442a..5fe4f15ff5 100644
--- a/app/labs/route.js
+++ b/app/labs/route.js
@@ -8,12 +8,5 @@ export default AbstractModuleRoute.extend({
   allowSearch: false,
   moduleName: 'labs',
   newButtonText: '+ new lab',
-  sectionTitle: 'Labs',
-  subActions: [{
-    text: 'Requests',
-    linkTo: 'labs.index'
-  }, {
-    text: 'Completed',
-    linkTo: 'labs.completed'
-  }]
+  sectionTitle: 'Labs'
 });
diff --git a/app/medication/route.js b/app/medication/route.js
index f06baa275b..e690456e5a 100644
--- a/app/medication/route.js
+++ b/app/medication/route.js
@@ -45,17 +45,6 @@ export default AbstractModuleRoute.extend({
     findArgs: ['lookup', 'warehouse_list']
   }],
 
-  subActions: function() {
-    let i18n = this.get('i18n');
-    return [{
-      text: i18n.t('labels.requests'),
-      linkTo: 'medication.index'
-    }, {
-      text: i18n.t('labels.completed'),
-      linkTo: 'medication.completed'
-    }];
-  }.property(),
-
   actions: {
     dispenseMedication: function() {
       if (this.currentUserCan('fulfill_medication')) {
diff --git a/app/patients/route.js b/app/patients/route.js
index 4f3add3541..101d1aab2c 100644
--- a/app/patients/route.js
+++ b/app/patients/route.js
@@ -50,14 +50,6 @@ export default AbstractModuleRoute.extend(PatientId, {
       }.bind(this));
     }
   },
-  moduleName: 'patients',
   newButtonText: '+ new patient',
-  sectionTitle: 'Patients',
-  subActions: [{
-    text: 'Patient listing',
-    linkTo: 'patients.index'
-  }, {
-    text: 'Reports',
-    linkTo: 'patients.reports'
-  }]
+  moduleName: 'patients'
 });
diff --git a/app/styles/_bootstrap-theme.scss b/app/styles/_bootstrap-theme.scss
index 30cc677107..bb0ddea592 100644
--- a/app/styles/_bootstrap-theme.scss
+++ b/app/styles/_bootstrap-theme.scss
@@ -264,8 +264,6 @@
       padding: 0;
       color: $navy;
     }
-
-    .panel-body { padding-top: 0; }
   }
 }
 
diff --git a/app/styles/_variables_mixins.scss b/app/styles/_variables_mixins.scss
index bbd0037b1e..e0d835b3ab 100644
--- a/app/styles/_variables_mixins.scss
+++ b/app/styles/_variables_mixins.scss
@@ -56,6 +56,7 @@ $view_sub_nav:          #6784a2;
   font-size: 28px;
   line-height: 55px;
   margin: 0;
+  float: left;
 }
 
 // layout
diff --git a/app/templates/section.hbs b/app/templates/section.hbs
index 4477ec0c2e..48be81ebe9 100644
--- a/app/templates/section.hbs
+++ b/app/templates/section.hbs
@@ -4,10 +4,6 @@
 
         <div class="view-top-bar">
             <h1 class="view-current-title">{{currentScreenTitle}}</h1>
-        </div>
-
-        <div class="view-sub-bar">
-
             <div class="view-action-buttons">
                 {{#if newButtonAction}}
                 <button class="btn btn-primary" {{action newButtonAction}}>{{newButtonText}}</button>
@@ -20,7 +16,9 @@
                     {{/each}}
                 {{/if}}
             </div>
+        </div>
 
+        <div class="view-sub-bar">
             <ul class="nav nav-pills view-sub-nav">
                 {{#each subActions as |subAction|}}
                     {{#if subAction.statusQuery}}

From 26d4c5228db11ea7527fe009172fe21818e78457 Mon Sep 17 00:00:00 2001
From: Darin Swanson <dswanson@newrelic.com>
Date: Fri, 18 Mar 2016 13:20:47 -0700
Subject: [PATCH 2/2] Alter the tests to match the screens with sub nave
 removed.

---
 app/admin/route.js                    | 2 +-
 tests/acceptance/appointments-test.js | 3 ---
 tests/acceptance/imaging-test.js      | 2 --
 tests/acceptance/inventory-test.js    | 4 +---
 tests/acceptance/labs-test.js         | 2 --
 tests/acceptance/medication-test.js   | 2 --
 tests/acceptance/patients-test.js     | 2 --
 7 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/app/admin/route.js b/app/admin/route.js
index 6b44a03950..50f17037d6 100644
--- a/app/admin/route.js
+++ b/app/admin/route.js
@@ -4,7 +4,7 @@ export default AbstractModuleRoute.extend({
   allowSearch: false,
   moduleName: 'admin',
   sectionTitle: 'Admin',
-  
+
   editPath: function() {
     return 'users.edit';
   }.property(),
diff --git a/tests/acceptance/appointments-test.js b/tests/acceptance/appointments-test.js
index 248095bc09..29f63d578c 100644
--- a/tests/acceptance/appointments-test.js
+++ b/tests/acceptance/appointments-test.js
@@ -18,9 +18,6 @@ test('visiting /appointments', function(assert) {
     visit('/appointments');
     andThen(function() {
       assert.equal(currentURL(), '/appointments');
-      findWithAssert('a:contains(This Week)');
-      findWithAssert('a:contains(Today)');
-      findWithAssert('a:contains(Search)');
       findWithAssert('button:contains(new appointment)');
       findWithAssert('.table-header');
     });
diff --git a/tests/acceptance/imaging-test.js b/tests/acceptance/imaging-test.js
index bb6beb5800..af85dc1929 100644
--- a/tests/acceptance/imaging-test.js
+++ b/tests/acceptance/imaging-test.js
@@ -19,8 +19,6 @@ test('visiting /imaging', function(assert) {
 
     andThen(() => {
       assert.equal(currentURL(), '/imaging');
-      assert.equal(find('li a:contains(Requests)').length, 1, 'Requests link is visible');
-      assert.equal(find('li a:contains(Completed)').length, 1, 'Completed link is visible');
       let newImagingButton = find('button:contains(new imaging)');
       assert.equal(newImagingButton.length, 1, 'New Imaging button is visible');
       findWithAssert('p:contains(No items found. )');
diff --git a/tests/acceptance/inventory-test.js b/tests/acceptance/inventory-test.js
index c9566b96dc..7050f6aabf 100644
--- a/tests/acceptance/inventory-test.js
+++ b/tests/acceptance/inventory-test.js
@@ -19,10 +19,8 @@ test('visiting /inventory', function(assert) {
 
     andThen(function() {
       assert.equal(currentURL(), '/inventory');
-      findWithAssert('li a:contains(Requests)');
-      findWithAssert('li a:contains(Items)');
-      findWithAssert('li a:contains(Reports)');
       findWithAssert('button:contains(new request)');
+      findWithAssert('button:contains(inventory received)');
       findWithAssert('p:contains(No requests found. )');
       findWithAssert('a:contains(Create a new request?)');
     });
diff --git a/tests/acceptance/labs-test.js b/tests/acceptance/labs-test.js
index 48ec6ec99c..0ee7f1a10c 100644
--- a/tests/acceptance/labs-test.js
+++ b/tests/acceptance/labs-test.js
@@ -19,8 +19,6 @@ test('visiting /labs', function(assert) {
 
     andThen(function() {
       assert.equal(currentURL(), '/labs');
-      findWithAssert('a:contains(Requests)');
-      findWithAssert('a:contains(Completed)');
       findWithAssert('a:contains(Create a new record?)');
       findWithAssert('button:contains(new lab)');
     });
diff --git a/tests/acceptance/medication-test.js b/tests/acceptance/medication-test.js
index 6e0cef4f25..f5821fee3b 100644
--- a/tests/acceptance/medication-test.js
+++ b/tests/acceptance/medication-test.js
@@ -19,8 +19,6 @@ test('visiting /medication', function(assert) {
 
     andThen(function() {
       assert.equal(currentURL(), '/medication');
-      assert.equal(find('li a:contains(Requests)').length, 1, 'Requests link is visible');
-      assert.equal(find('li a:contains(Completed)').length, 1, 'Completed link is visible');
       findWithAssert('button:contains(new request)');
       findWithAssert('button:contains(dispense medication)');
       findWithAssert('button:contains(return medication)');
diff --git a/tests/acceptance/patients-test.js b/tests/acceptance/patients-test.js
index b1961a08f6..844db1beff 100644
--- a/tests/acceptance/patients-test.js
+++ b/tests/acceptance/patients-test.js
@@ -22,8 +22,6 @@ test('visiting /patients route', function(assert) {
       assert.equal(noPatientsFound.text().trim(), 'No patients found. Create a new patient record?', 'no records found');
       const newPatientButton = find('button:contains(+ new patient)');
       assert.equal(newPatientButton.length, 1, 'Add new patient button is visible');
-      assert.equal(find('.nav-pills li:contains(Patient listing)').length, 1, 'Patient listing link is visible');
-      assert.equal(find('.nav-pills li:contains(Reports)').length, 1, 'Reports link is visible');
     });
     click('button:contains(+ new patient)');
     andThen(function() {