Merge pull request #6 from HospitalRun/master

Merge branch 'master'
HospitalRun · Jun 24, 2018 · a7fd7d9 · a7fd7d9
2 parents 3f7728a + 9ae3453
commit a7fd7d9
Show file tree

Hide file tree

Showing 58 changed files with 3,665 additions and 444 deletions.
diff --git a/app/admin/query/template.hbs b/app/admin/query/template.hbs
@@ -5,7 +5,7 @@
     <div class="panel-body">
       {{#em-form model=this submitButton=false as |form|}}
         <div class="row">
-          {{form.select class="col-xs-3" label="Object Type"
+          {{form.select class="col-xs-3 form-input-group" label="Object Type"
               property="objectType" content=objectTypes
               selected=objectType
           }}

diff --git a/app/admin/roles/template.hbs b/app/admin/roles/template.hbs
@@ -2,7 +2,7 @@
   <div class="panel panel-primary">
     <div class="panel-body">
       {{#em-form model=this submitButton=false as |form|}}
-        <div class="form-group has-success">
+        <div class="form-input-group has-success">
           <label class="control-label">{{t 'labels.role'}}</label>
           <select onchange={{action "selectRole" value="target.value"}} class="form-control role-select">
             <option disabled selected={{is-not selectedRole}}>

diff --git a/app/admin/visit-forms/template.hbs b/app/admin/visit-forms/template.hbs
@@ -11,14 +11,16 @@
         <tr>
           <td>{{visitForm.type}}</td>
           <td>
-            <select onchange={{action 'selectForm' visitForm.type}} class="form-control role-select">
-              {{#each visitTemplates as |visitTemplate|}}
-                <option value="{{visitTemplate.id}}"
-                        selected={{eq visitForm.form visitTemplate.id}}>
-                  {{visitTemplate.value}}
-                </option>
-              {{/each}}
-            </select>
+            <div class="form-input-group">
+              <select onchange={{action 'selectForm' visitForm.type}} class="form-control role-select">
+                {{#each visitTemplates as |visitTemplate|}}
+                  <option value="{{visitTemplate.id}}"
+                          selected={{eq visitForm.form visitTemplate.id}}>
+                    {{visitTemplate.value}}
+                  </option>
+                {{/each}}
+              </select>
+            </div>
           </td>
         </tr>
       {{/each}}

diff --git a/app/custom-form-add/template.hbs b/app/custom-form-add/template.hbs
@@ -7,7 +7,7 @@
   {{#em-form model=model submitButton=false as |form|}}
     {{form.select label=(t 'customForms.labels.formToAdd')
       property="selectedForm" content=model.customForms
-      prompt=" " class="form-to-add"
+      prompt=" " class="form-to-add form-input-group"
     }}
   {{/em-form}}
 {{/modal-dialog}}
diff --git a/app/imaging/edit/template.hbs b/app/imaging/edit/template.hbs
@@ -7,7 +7,7 @@
     {{/if}}
     {{#if model.isNew}}
       <div class="row">
-        {{form.select class="col-xs-3 required" label=(t 'labels.visit')
+        {{form.select class="col-xs-3 required form-input-group" label=(t 'labels.visit')
           property="visit" content=patientVisitsForSelect
           optionValuePath="selectObject" optionLabelPath="selectObject.visitDescription"
           prompt=(t 'imaging.labels.addNewVisit')

diff --git a/app/incident/route.js b/app/incident/route.js
@@ -10,6 +10,9 @@ export default AbstractModuleRoute.extend({
     name: 'incidentCategoryList',
     findArgs: ['inc-category']
   }],
+  allowSearch: false,
+  editTitle: t('incidents.titles.editIncident'),
+  newTitle: t('incidents.titles.newIncident'),
   moduleName: 'incident',
   newButtonText: t('incident.buttons.newIncident'),
   sectionTitle: t('incident.titles.incidents')

diff --git a/app/inventory/adjust/template.hbs b/app/inventory/adjust/template.hbs
@@ -17,7 +17,7 @@
       <p class="form-control-static">{{model.quantity}}</p>
     </div>
     <div class="row">
-      {{form.select class="col-sm-4" label=(t 'inventory.labels.adjustmentType')
+      {{form.select class="col-sm-4 form-input-group" label=(t 'inventory.labels.adjustmentType')
         property="transactionType" content=adjustmentTypes
         optionValuePath="type" optionLabelPath="name"
       }}

diff --git a/app/inventory/rank-select/template.hbs b/app/inventory/rank-select/template.hbs
@@ -2,6 +2,6 @@
   label=(t 'inventory.labels.rank')
   property=property
   content=options
-  class=class
+  class=(concat 'form-input-group ' class)
   prompt=prompt
   }}
diff --git a/app/invoices/edit/controller.js b/app/invoices/edit/controller.js
@@ -133,15 +133,15 @@ export default AbstractEditController.extend(NumberFormat, PatientSubmodule, Pub
     },
 
     showDeleteItem(itemToDelete, deleteFrom) {
-      this.showDeleteModal(itemToDelete, EmberObject.create({
+      this.send('showDeleteModal', itemToDelete, EmberObject.create({
         confirmAction: 'deleteCharge',
         deleteFrom,
         title: 'Delete Charge'
       }));
     },
 
     showDeleteLineItem(item) {
-      this.showDeleteModal(item, EmberObject.create({
+      this.send('showDeleteModal', item, EmberObject.create({
         confirmAction: 'deleteLineItem',
         title: 'Delete Line Item'
       }));

diff --git a/app/invoices/edit/template.hbs b/app/invoices/edit/template.hbs
@@ -13,7 +13,7 @@
       {{date-picker model=model property="billDate" label=(t 'labels.billDate') class="col-xs-2"}}
       {{#if model.isNew}}
         {{patient-typeahead model=model property="patientTypeAhead" label=(t 'labels.patient') content=patientList selection=selectedPatient class="col-xs-4 required invoice-patient"}}
-        {{form.select class="col-xs-4 required invoice-visit" label=(t 'labels.visit')
+        {{form.select class="col-xs-4 required form-input-group invoice-visit" label=(t 'labels.visit')
             property="visit" content=patientVisitsForSelect
             optionValuePath="selectObject" optionLabelPath="selectObject.visitDescription"
             selected=model.visit
@@ -33,7 +33,7 @@
         content=pricingProfiles
         optionValuePath="selectObject"
         optionLabelPath="selectObject.name"
-        class="col-xs-3"
+        class="col-xs-3 form-input-group"
         prompt=" "
         selected=model.paymentProfile
       }}
@@ -74,28 +74,28 @@
                       {{if item.showDetails 'glyphicon-minus' 'glyphicon-plus'}}"
                         {{action "toggleDetails" item bubbles=false }}>
                     </span>
-                    <strong>{{input class="form-control" value=item.name }}</strong>
+                    <strong>{{input class="form-control item-name" value=item.name }}</strong>
                   </div>
                 </td>
-                <td class="col-xs-1 text-right">
+                <td class="col-xs-1 text-right item-total">
                   {{number-format item.total}}
                 </td>
                 <td class="col-xs-1">
                   <div class="form-group">
-                    {{input class="form-control text-right" value=item.discount }}
+                    {{input class="form-control text-right item-discount" value=item.discount }}
                   </div>
                 </td>
                 <td class="col-xs-1">
                   <div class="form-group">
-                    {{input class="form-control text-right" value=item.nationalInsurance }}
+                    {{input class="form-control text-right item-national-insurance" value=item.nationalInsurance }}
                   </div>
                 </td>
                 <td class="col-xs-1">
                   <div class="form-group">
-                    {{input class="form-control text-right" value=item.privateInsurance }}
+                    {{input class="form-control text-right item-private-insurance" value=item.privateInsurance }}
                   </div>
                 </td>
-                <td class="col-xs-1 text-right">{{number-format item.amountOwed}}</td>
+                <td class="col-xs-1 text-right item-amount-owed">{{number-format item.amountOwed}}</td>
                 <td class="col-xs-2">
                   {{#if canAddCharge}}
                     <button class="btn btn-default warning" {{action "showDeleteLineItem" item bubbles=false }}>
@@ -122,16 +122,16 @@
                 {{#each item.details as |detail|}}
                   <tr>
                     <td colspan="2" class="col-xs-6 input-group">
-                      {{input class="form-control" value=detail.name }}
+                      {{input class="form-control detail-name" value=detail.name }}
                     </td>
                     <td class="col-xs-1">
                       <div class="form-group">
-                        {{input class="form-control" value=detail.quantity }}
+                        {{input class="form-control detail-quantity" value=detail.quantity }}
                       </div>
                     </td>
                     <td class="col-xs-1">
                       <div class="form-group">
-                        {{input class="form-control" value=detail.price }}
+                        {{input class="form-control detail-price" value=detail.price }}
                       </div>
                     </td>
                     <td class="col-xs-1">
@@ -143,7 +143,7 @@
                         </select>
                       </div>
                     </td>
-                    <td class="col-xs-1 text-right">
+                    <td class="col-xs-1 text-right detail-amount-owed">
                       {{number-format detail.amountOwed}}
                     </td>
                     <td class="col-xs-2">
@@ -161,39 +161,39 @@
               <td>
                 <strong>{{t 'labels.total'}} {{categoryGroup.category}}</strong>
               </td>
-              <td class="text-right">{{number-format categoryGroup.total}}</td>
-              <td class="text-right">{{number-format categoryGroup.discount}}</td>
-              <td class="text-right">{{number-format categoryGroup.nationalInsurance}}</td>
-              <td class="text-right">{{number-format categoryGroup.privateInsurance}}</td>
-              <td class="text-right">{{number-format categoryGroup.amountOwed }}</td>
+              <td class="text-right category-group-total">{{number-format categoryGroup.total}}</td>
+              <td class="text-right category-group-discount">{{number-format categoryGroup.discount}}</td>
+              <td class="text-right category-group-national-insurance">{{number-format categoryGroup.nationalInsurance}}</td>
+              <td class="text-right category-group-private-insurance">{{number-format categoryGroup.privateInsurance}}</td>
+              <td class="text-right category-group-amount-owed">{{number-format categoryGroup.amountOwed }}</td>
               <td></td>
             </tr>
           {{/each}}
           <tr>
             <td>
               <strong>{{t 'labels.total'}}</strong>
             </td>
-            <td class="text-right">{{number-format model.total}}</td>
-            <td class="text-right">{{number-format model.discount}}</td>
-            <td class="text-right">{{number-format model.nationalInsurance}}</td>
-            <td class="text-right">{{number-format model.privateInsurance}}</td>
-            <td class="text-right">{{number-format model.finalPatientResponsibility}}</td>
+            <td class="text-right total">{{number-format model.total}}</td>
+            <td class="text-right discount">{{number-format model.discount}}</td>
+            <td class="text-right national-insurance">{{number-format model.nationalInsurance}}</td>
+            <td class="text-right private-insurance">{{number-format model.privateInsurance}}</td>
+            <td class="text-right final-patient-responsibility">{{number-format model.finalPatientResponsibility}}</td>
             <td></td>
           </tr>
           <tr>
             <td>
               <strong>{{t 'billing.labels.paymentsDeposits'}}</strong>
             </td>
             <td colspan="4"></td>
-            <td class="text-right">-{{number-format model.paidTotal}}</td>
+            <td class="text-right paid-total">-{{number-format model.paidTotal}}</td>
             <td></td>
           </tr>
           <tr>
             <td>
               <strong>{{t 'labels.grandTotal'}}</strong>
             </td>
             <td colspan="4"></td>
-            <td class="text-right">{{number-format model.remainingBalance}}</td>
+            <td class="text-right remaining-balance">{{number-format model.remainingBalance}}</td>
             <td></td>
           </tr>
           {{#if model.paymentProfile}}

diff --git a/app/labs/edit/template.hbs b/app/labs/edit/template.hbs
@@ -7,7 +7,7 @@
     {{/if}}
     {{#if model.isNew}}
       <div class="row">
-        {{form.select class="col-xs-3 required test-visit-type" label=(t 'labels.visit')
+        {{form.select class="col-xs-3 required form-input-group test-visit-type" label=(t 'labels.visit')
           property="visit" content=patientVisitsForSelect
           optionValuePath="selectObject" optionLabelPath="selectObject.visitDescription"
           prompt=(t 'labs.labels.addNewVisit')