Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

Commit

Permalink
Fixed failing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@jkleinsc
jkleinsc committed Mar 1, 2016
1 parent e3df4c7 commit a5fcfeb
Show file tree
Hide file tree
Showing 5 changed files with 183 additions and 183 deletions.
3 changes: 1 addition & 2 deletions app/admin/address/controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ export default AbstractEditController.extend({
updateCapability: 'update_config',

afterUpdate: function() {
this.displayAlert(this.get('i18n').t('admin.address.titles.options_saved'),
this.get('i18n').t('admin.address.messages.address_saved'));
this.displayAlert(this.get('i18n').t('admin.address.titles.options_saved'), this.get('i18n').t('admin.address.messages.address_saved'));
}
});
355 changes: 178 additions & 177 deletions app/admin/lookup/controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,183 +10,184 @@ export default Ember.Controller.extend(BillingCategories, LabPricingTypes,
ModalHelper, ImagingPricingTypes, InventoryTypeList, UnitTypes, VisitTypes, {
fileSystem: Ember.inject.service('filesystem'),
lookupTypes: Ember.computed(function() {
return [{
name: this.get('i18n').t('admin.lookup.anesthesia_types'),
value: 'anesthesia_types',
model: {
procedure: 'anesthesiaType'
}
}, {
name: this.get('i18n').t('admin.lookup.anesthesiologists'),
value: 'anesthesiologists',
model: {
procedure: 'anesthesiologist'
}
}, {
defaultValues: 'defaultBillingCategories',
name: this.get('i18n').t('admin.lookup.billing_categories'),
value: 'billing_categories',
models: {
'billing-line-item': 'category'
}
}, {
name: this.get('i18n').t('admin.lookup.clinic_list'),
value: 'clinic_list',
models: { // Models that use this lookup -- use this later to update models on lookup changes
patient: 'clinic'
}
}, {
name: this.get('i18n').t('admin.lookup.country_list'),
value: 'country_list',
models: {
patient: 'country'
}
}, {
name: this.get('i18n').t('admin.lookup.diagnosis_list'),
value: 'diagnosis_list',
models: {
visit: 'primaryDiagnosis'
}
}, {
name: this.get('i18n').t('admin.lookup.cpt_code_list'),
value: 'cpt_code_list',
models: {
procedure: 'cptCode'
}
}, {
name: this.get('i18n').t('admin.lookup.expense_account_list'),
value: 'expense_account_list',
models: {
'inv-request': 'expenseAccount',
pricing: 'expenseAccount'
}
}, {
name: this.get('i18n').t('admin.lookup.aisle_location_list'),
value: 'aisle_location_list',
models: {
inventory: 'aisleLocation',
'inv-location': 'aisleLocation',
'inv-purchase': 'aisleLocation',
'inv-request': [
'deliveryAisle',
'locationsAffected' // Special use case that we need to handle
]
}
}, {
name: this.get('i18n').t('admin.lookup.warehouse_list'),
value: 'warehouse_list',
models: {
inventory: 'location',
'inv-location': 'location',
'inv-purchase': 'location',
'inv-request': [
'deliveryLocation',
'locationsAffected' // Special use case that we need to handle
]
}
}, {
defaultValues: 'defaultInventoryTypes',
name: this.get('i18n').t('admin.lookup.inventory_types'),
value: 'inventory_types',
models: {
inventory: 'inventoryType'
}
}, {
defaultValues: 'defaultImagingPricingTypes',
name: this.get('i18n').t('admin.lookup.imaging_pricing_types'),
value: 'imaging_pricing_types',
models: {
pricing: 'pricingType'
}
}, {
defaultValues: 'defaultLabPricingTypes',
name: this.get('i18n').t('admin.lookup.lab_pricing_types'),
value: 'lab_pricing_types',
models: {
pricing: 'pricingType'
}
}, {
name: this.get('i18n').t('admin.lookup.patient_status_list'),
value: 'patient_status_list',
models: {
patient: 'status'
}
}, {
name: this.get('i18n').t('admin.lookup.physician_list'),
value: 'physician_list',
models: {
appointment: 'provider',
visit: 'examiner',
procedure: [
'assistant',
'physician'
]
}
}, {
name: this.get('i18n').t('admin.lookup.procedure_list'),
value: 'procedure_list',
models: {
procedure: 'description'
}
}, {
name: this.get('i18n').t('admin.lookup.procedure_locations'),
value: 'procedure_locations',
models: {
procedure: 'location'
}
}, {
name: this.get('i18n').t('admin.lookup.procedure_pricing_types'),
value: 'procedure_pricing_types',
models: {
pricing: 'pricingType'
}
}, {
name: this.get('i18n').t('admin.lookup.radiologists'),
value: 'radiologists',
model: {
imaging: 'radiologist'
}
}, {
name: 'Sex',
value: 'sex',
model: {
patient: 'sex'
}
}, {
defaultValues: 'defaultUnitList',
name: this.get('i18n').t('admin.lookup.unit_types'),
value: 'unit_types',
models: {
inventory: 'distributionUnit',
'inv-purchase': 'distributionUnit'
}
}, {
name: this.get('i18n').t('admin.lookup.vendor_list'),
value: 'vendor_list',
models: {
'inv-purchase': 'vendor'
}
}, {
name: this.get('i18n').t('admin.lookup.visit_location_list'),
value: 'visit_location_list',
models: {
appointment: 'location',
visit: 'location'
}
}, {
defaultValues: 'defaultVisitTypes',
name: this.get('i18n').t('admin.lookup.visit_types'),
value: 'visit_types',
models: {
visit: 'visitType'
}
}, {
name: this.get('i18n').t('admin.lookup.visit_types'),
value: 'ward_pricing_types',
models: {
pricing: 'pricingType'
}
}];}),
return [{
name: this.get('i18n').t('admin.lookup.anesthesia_types'),
value: 'anesthesia_types',
model: {
procedure: 'anesthesiaType'
}
}, {
name: this.get('i18n').t('admin.lookup.anesthesiologists'),
value: 'anesthesiologists',
model: {
procedure: 'anesthesiologist'
}
}, {
defaultValues: 'defaultBillingCategories',
name: this.get('i18n').t('admin.lookup.billing_categories'),
value: 'billing_categories',
models: {
'billing-line-item': 'category'
}
}, {
name: this.get('i18n').t('admin.lookup.clinic_list'),
value: 'clinic_list',
models: { // Models that use this lookup -- use this later to update models on lookup changes
patient: 'clinic'
}
}, {
name: this.get('i18n').t('admin.lookup.country_list'),
value: 'country_list',
models: {
patient: 'country'
}
}, {
name: this.get('i18n').t('admin.lookup.diagnosis_list'),
value: 'diagnosis_list',
models: {
visit: 'primaryDiagnosis'
}
}, {
name: this.get('i18n').t('admin.lookup.cpt_code_list'),
value: 'cpt_code_list',
models: {
procedure: 'cptCode'
}
}, {
name: this.get('i18n').t('admin.lookup.expense_account_list'),
value: 'expense_account_list',
models: {
'inv-request': 'expenseAccount',
pricing: 'expenseAccount'
}
}, {
name: this.get('i18n').t('admin.lookup.aisle_location_list'),
value: 'aisle_location_list',
models: {
inventory: 'aisleLocation',
'inv-location': 'aisleLocation',
'inv-purchase': 'aisleLocation',
'inv-request': [
'deliveryAisle',
'locationsAffected' // Special use case that we need to handle
]
}
}, {
name: this.get('i18n').t('admin.lookup.warehouse_list'),
value: 'warehouse_list',
models: {
inventory: 'location',
'inv-location': 'location',
'inv-purchase': 'location',
'inv-request': [
'deliveryLocation',
'locationsAffected' // Special use case that we need to handle
]
}
}, {
defaultValues: 'defaultInventoryTypes',
name: this.get('i18n').t('admin.lookup.inventory_types'),
value: 'inventory_types',
models: {
inventory: 'inventoryType'
}
}, {
defaultValues: 'defaultImagingPricingTypes',
name: this.get('i18n').t('admin.lookup.imaging_pricing_types'),
value: 'imaging_pricing_types',
models: {
pricing: 'pricingType'
}
}, {
defaultValues: 'defaultLabPricingTypes',
name: this.get('i18n').t('admin.lookup.lab_pricing_types'),
value: 'lab_pricing_types',
models: {
pricing: 'pricingType'
}
}, {
name: this.get('i18n').t('admin.lookup.patient_status_list'),
value: 'patient_status_list',
models: {
patient: 'status'
}
}, {
name: this.get('i18n').t('admin.lookup.physician_list'),
value: 'physician_list',
models: {
appointment: 'provider',
visit: 'examiner',
procedure: [
'assistant',
'physician'
]
}
}, {
name: this.get('i18n').t('admin.lookup.procedure_list'),
value: 'procedure_list',
models: {
procedure: 'description'
}
}, {
name: this.get('i18n').t('admin.lookup.procedure_locations'),
value: 'procedure_locations',
models: {
procedure: 'location'
}
}, {
name: this.get('i18n').t('admin.lookup.procedure_pricing_types'),
value: 'procedure_pricing_types',
models: {
pricing: 'pricingType'
}
}, {
name: this.get('i18n').t('admin.lookup.radiologists'),
value: 'radiologists',
model: {
imaging: 'radiologist'
}
}, {
name: this.get('i18n').t('labels.sex'),
value: 'sex',
model: {
patient: 'sex'
}
}, {
defaultValues: 'defaultUnitList',
name: this.get('i18n').t('admin.lookup.unit_types'),
value: 'unit_types',
models: {
inventory: 'distributionUnit',
'inv-purchase': 'distributionUnit'
}
}, {
name: this.get('i18n').t('admin.lookup.vendor_list'),
value: 'vendor_list',
models: {
'inv-purchase': 'vendor'
}
}, {
name: this.get('i18n').t('admin.lookup.visit_location_list'),
value: 'visit_location_list',
models: {
appointment: 'location',
visit: 'location'
}
}, {
defaultValues: 'defaultVisitTypes',
name: this.get('i18n').t('admin.lookup.visit_types'),
value: 'visit_types',
models: {
visit: 'visitType'
}
}, {
name: this.get('i18n').t('admin.lookup.ward_pricing_types'),
value: 'ward_pricing_types',
models: {
pricing: 'pricingType'
}
}];
}),

importFile: Ember.computed.alias('lookupTypeList.importFile'),

Expand Down
4 changes: 2 additions & 2 deletions app/users/delete/controller.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import AbstractDeleteController from 'hospitalrun/controllers/abstract-delete-controller';
import { translationMacro as t } from "ember-i18n";
import { translationMacro as t } from 'ember-i18n';
export default AbstractDeleteController.extend({
title: t('labels.delete_user'),
title: t('labels.delete_user')
});
2 changes: 1 addition & 1 deletion app/users/edit/route.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import AbstractEditRoute from 'hospitalrun/routes/abstract-edit-route';
import Ember from 'ember';
import { translationMacro as t } from "ember-i18n";
import { translationMacro as t } from 'ember-i18n';
export default AbstractEditRoute.extend({
editTitle: t('labels.edit_user'),
modelName: 'user',
Expand Down
2 changes: 1 addition & 1 deletion app/users/index/route.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import AbstractIndexRoute from 'hospitalrun/routes/abstract-index-route';
import UserSession from 'hospitalrun/mixins/user-session';
import { translationMacro as t } from "ember-i18n";
import { translationMacro as t } from 'ember-i18n';
export default AbstractIndexRoute.extend(UserSession, {
newButtonAction: function() {
if (this.currentUserCan('add_user')) {
Expand Down

0 comments on commit a5fcfeb

Please sign in to comment.