fix: merge issues

This commit fixes the following issues with the latest merge from
master:
 1. reference groups - broken routes in app.js
 2. accounts - the API changed, breaking billing_services
 3. bh-date-editor -  the patient invoice module no longer has two
 "date" labels
 4. patient registration - the registration page now routes to
 patients/edit.

client/src/js/app.js

@@ -306,7 +306,8 @@ function bhimaConfig($stateProvider, $urlRouterProvider, $urlMatcherFactoryProvi
   })
 
   /* 2.X Journal routes */
-  .when('/journal', { 
+  .state('journal', {
+    url : '/journal',
     controller : 'JournalController as JournalCtrl', 
     templateUrl : 'partials/2.X-journal/journal.html'
   })
@@ -326,7 +327,8 @@ function bhimaConfig($stateProvider, $urlRouterProvider, $urlMatcherFactoryProvi
     controller: 'ReferenceController',
     templateUrl: 'partials/references/references.html'
   })
-  .state('/references/groups', {
+  .state('referenceGroups', {
+    url : '/references/groups',
     controller: 'ReferenceGroupController as ReferenceGroupCtrl',
     templateUrl: 'partials/references/groups/groups.html'
   })
@@ -495,7 +497,7 @@ function bhimaConfig($stateProvider, $urlRouterProvider, $urlMatcherFactoryProvi
     templateUrl: 'partials/patients/edit/edit.html'
   })
 
-  /* */
+  /* Patient Invoicing */
 
   .state('patientInvoice', {
     url : '/invoices/patient',

client/src/js/services/AccountService.js

@@ -42,11 +42,11 @@ function AccountService($http, util, sessionService) {
       .then(util.unwrapHttpResponse)
       .then(function (accounts) {
 
-        // if we recieved an array of accounts from the server,
+        // if we received an array of accounts from the server,
         // label the accounts with a nice human readable label
         if (angular.isArray(accounts)) {
           accounts.forEach(function (account) {
-            account.label = label(account);
+            account.hrlabel = label(account);
           });
         }
 
@@ -66,7 +66,7 @@ function AccountService($http, util, sessionService) {
         // FIXME - make /accounts return the account type w/o query string
         // and preformat the numberLabel elsewhere
         accounts.forEach(function (account) {
-          account.label = label(account);
+          account.hrlabel = label(account);
         });
 
         return accounts;
@@ -81,7 +81,7 @@ function AccountService($http, util, sessionService) {
   }
 
   function label(account) {
-    return account.account_number + ' - ' + account.account_txt;
+    return account.number + ' - ' + account.label;
   }
 
   /**

client/src/js/services/BillingServicesService.js

@@ -90,7 +90,7 @@ function BillingServicesService($http, util) {
     // remove unneeded properties
     delete data.updated_at;
     delete data.created_at;
-    delete data.account_number;
+    delete data.number; // account number
 
     return $http.put(target, { billingService : data } )
       .then(util.unwrapHttpResponse);

client/src/partials/billing_services/modal.html

@@ -21,7 +21,7 @@ <h4>{{ BillingServicesFormCtrl.title | translate }}<span ng-show="BillingService
         name="account"
         ng-model="BillingServicesFormCtrl.model.account"
         placeholder="{{ 'PLACEHOLDERS.ENTER.ACCOUNT' | translate }}"
-        uib-typeahead="account as account.label for account in BillingServicesFormCtrl.accounts | filter:$viewValue | limitTo:6"
+        uib-typeahead="account as account.hrlabel for account in BillingServicesFormCtrl.accounts | filter:$viewValue | limitTo:6"
         typeahead-editable="false"
         typeahead-template-url="partials/templates/typeahead/accounts.html"
         required>

client/src/partials/billing_services/update.js

@@ -88,8 +88,8 @@ function BillingServicesUpdateController($state, BillingServices, Accounts, Moda
     .then(function (data) {
       ModalInstance.close(data.id);
     })
-    .catch(function (error) {
-      vm.error = error;
+    .catch(function (response) {
+      vm.error = response.data;
     });
   }
 

client/src/partials/patient_invoice/patientInvoice.html

@@ -70,16 +70,13 @@
                 <!--
                   @todo - since we know this is a financial date, we could set min and max for periods etc.
                 -->
-                <div class="form-group has-feedback">
-                  <label class="control-label">{{ "COLUMNS.DATE" | translate }}</label>
-                  <bh-date-editor
-                      date-value="PatientInvoiceCtrl.Invoice.details.date"
-                      form="detailsForm"
-                      validation-trigger="detailsForm.$submitted"
-                      min-date="PatientInvoiceCtrl.minimumDate"
-                      max-date="PatientInvoiceCtrl.timestamp">
-                  </bh-date-editor>
-                </div>
+                <bh-date-editor
+                    date-value="PatientInvoiceCtrl.Invoice.details.date"
+                    form="detailsForm"
+                    validation-trigger="detailsForm.$submitted"
+                    min-date="PatientInvoiceCtrl.minimumDate"
+                    max-date="PatientInvoiceCtrl.timestamp">
+                </bh-date-editor>
 
                 <div class="form-group">
                   <label for="invoice-note">{{ "FORM.NOTES" | translate }}</label>

client/src/partials/patients/registration/registration.js

@@ -61,24 +61,26 @@ function PatientRegistrationController($location, ScrollTo, Patients, Debtors, S
         return Patients.logVisit(result.uuid);
       })
       .then(function (confirmation) {
-        var patientCardPath = '/invoice/patient/';
+        //var patientCardPath = '/invoices/patient/';
+        /** @fixme -  temporary path for end to end tests while we develop receipts */
+        var patientCardPath = '/patients/edit/';
 
-        //TODO Hospital card should recieve a value that notifies the user of register success
+        //TODO Hospital card should receive a value that notifies the user of register success
         $location.path(patientCardPath.concat(confirmation.uuid));
       })
       .catch(handleServerError);
-  };
+  }
 
   /**
    * Date and location utility methods
    */
   function enableFullDate() {
     viewModel.fullDateEnabled = true;
-  };
+  }
 
   function calculateYOB(value) {
     viewModel.medical.dob = value && value.length === 4 ? new Date(value + '-' + util.defaultBirthMonth) : undefined;
-  };
+  }
 
   /** 
    * This method is responsible for handling exceptions thrown by the server 

client/src/partials/vouchers/simple.html

@@ -50,7 +50,7 @@
                    class="form-control"
                    name="fromAccount"
                    placeholder="{{ 'PLACEHOLDERS.ENTER.ACCOUNT' | translate }}..."
-                   uib-typeahead="account as account.label for account in SimpleVoucherCtrl.accounts | filter:$viewValue | limitTo:10"
+                   uib-typeahead="account as account.hrlabel for account in SimpleVoucherCtrl.accounts | filter:$viewValue | limitTo:10"
                    typeahead-template-url="partials/templates/typeahead/accounts.html"
                    ng-model="SimpleVoucherCtrl.voucher.fromAccount"
                    required>

client/test/e2e/patient/registration.spec.js

@@ -66,7 +66,7 @@ describe('patient registration', function () {
     // submit the patient registration form
     FU.buttons.submit();
 
-    expect(browser.getCurrentUrl()).to.eventually.contain(browser.baseUrl + '#/invoice/patient/')
+    expect(browser.getCurrentUrl()).to.eventually.contain(browser.baseUrl + '#/patients/edit/')
     .then(function () {
       done();
     });

client/test/e2e/vouchers/simple.spec.js

@@ -6,6 +6,7 @@ var expect = chai.expect;
 // import testing utiliites
 var components = require('../shared/components');
 var FU = require('../shared/FormUtils');
+
 var helpers = require('../shared/helpers');
 helpers.configure(chai);
 

server/controllers/finance/billingServices.js

@@ -90,7 +90,7 @@ exports.list = function list(req, res, next) {
   if (req.query.detailed === '1') {
     sql =
       'SELECT bs.id, bs.label, bs.created_at, bs.updated_at, bs.account_id, ' +
-        'bs.description, bs.value, a.account_txt, a.account_number ' +
+        'bs.description, bs.value, a.number ' +
       'FROM billing_service AS bs JOIN account AS a ' +
         'ON bs.account_id = a.id ' +
       'ORDER BY bs.id;';