Merge branch 'v0.0.1' into remove-labs

openhealthcare · Nov 21, 2016 · 6f1a97e · 6f1a97e
2 parents 7f14c25 + 3b8e6a0
commit 6f1a97e
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 28 deletions.
diff --git a/config/karma.conf.js b/config/karma.conf.js
@@ -40,22 +40,9 @@ module.exports = function(config){
             "lib/bower_components/angular-mocks/angular-mocks.js",
 
             'lib/angular-ui-utils-0.1.0/ui-utils.js',
-            'lib/angular-ui-bootstrap-0.10.0/ui-bootstrap-tpls.js',
-            'lib/angular-strap-2.3.1/angular-strap.js',
-            'lib/angular-strap-2.3.1/modules/compiler.js',
-            'lib/angular-strap-2.3.1/modules/tooltip.js',
-            'lib/angular-strap-2.3.1/modules/tooltip.tpl.js',
-            'lib/angular-strap-2.3.1/modules/dimensions.js',
-            'lib/angular-strap-2.3.1/modules/parse-options.js',
-            'lib/angular-strap-2.3.1/modules/date-parser.js',
-            'lib/angular-strap-2.3.1/modules/datepicker.js',
-            'lib/angular-strap-2.3.1/modules/datepicker.tpl.js',
-            'lib/angular-strap-2.3.1/modules/timepicker.js',
-            'lib/angular-strap-2.3.1/modules/timepicker.tpl.js',
-            'lib/angular-strap-2.3.1/modules/typeahead.js',
-            'lib/angular-strap-2.3.1/modules/typeahead.tpl.js',
             "lib/angulartics-0.17.2/angulartics.min.js",
             "lib/angulartics-0.17.2/angulartics-ga.min.js",
+            "lib/ui-bootstrap-tpls-0.14.3.js",
             'lib/ngprogress-lite/ngprogress-lite.js',
             'lib/jquery-1.11.3/jquery-1.11.3.js',
             'lib/utils/underscore.js',

diff --git a/lib/opal-tb/tb/templates/pathway/initial_assessment.html b/lib/opal-tb/tb/templates/pathway/initial_assessment.html
@@ -27,26 +27,29 @@ <h3 >{% icon "fa-flask" %} Drug History </h3>
           </div>
           <div class="row form-horizontal content-offset-20" ng-repeat="editing in model.subrecords">
             <div class="col-md-3">
-              <input class="form-control ng-pristine ng-valid ng-valid-maxlength ng-touched" type="text" ng-model="editing.treatment.drug" autocomplete="off" bs-typeahead="" bs-options="i for i in antimicrobial_list" name="treatment_drug" ng-maxlength="255">
+              <input class="form-control ng-pristine ng-valid ng-valid-maxlength ng-touched" type="text" ng-model="editing.treatment.drug" autocomplete="off"
+                     uib-typeahead="i for i in antimicrobial_list | filter:$viewValue | limitTo:8" name="treatment_drug" ng-maxlength="255">
             </div>
             <div class="col-md-2">
               <input class="form-control ng-pristine ng-valid ng-valid-maxlength ng-touched" type="text" ng-model="editing.treatment.dose" autocomplete="off" name="treatment_dose" ng-maxlength="255">
             </div>
             <div class="col-md-3">
-              <input class="form-control ng-pristine ng-valid ng-valid-maxlength ng-touched" type="text" ng-model="editing.treatment.route" autocomplete="off" bs-typeahead="" bs-options="i for i in drugroute_list" name="treatment_route" ng-maxlength="255">
+              <input class="form-control ng-pristine ng-valid ng-valid-maxlength ng-touched" type="text" ng-model="editing.treatment.route" autocomplete="off"
+                     uib-typeahead="i for i in drugroute_list | filter:$viewValue | limitTo:8" name="treatment_route" ng-maxlength="255">
             </div>
             <div class="col-md-3">
-              <input class="form-control ng-pristine ng-valid ng-valid-maxlength ng-touched" type="text" ng-model="editing.treatment.frequency" autocomplete="off" bs-typeahead="" bs-options="i for i in drugfreq_list" name="treatment_frequency" ng-maxlength="255">
+              <input class="form-control ng-pristine ng-valid ng-valid-maxlength ng-touched" type="text" ng-model="editing.treatment.frequency" autocomplete="off"
+                     uib-typeahead="i for i in drugfreq_list | filter:$viewValue | limitTo:8" name="treatment_frequency" ng-maxlength="255">
             </div>
             <div class="col-md-1">
-              <button ng-click="remove($index)" class="btn btn-secondary" data-title="Remove" bs-tooltip>
+              <button ng-click="remove($index)" class="btn btn-secondary">
                 {% icon "fa-trash" %}
               </button>
             </div>
           </div>
           <div class="row content-offset-20">
             <div class="col-md-1 col-md-offset-11">
-              <button class="btn-primary btn" ng-click="addAnother()" data-title="Add Another" bs-tooltip>
+              <button class="btn-primary btn" ng-click="addAnother()">
                 {% icon "glyphicon-plus" %}
               </button>
             </div>

diff --git a/lib/opal-tb/tb/templates/pathway/observe_dot.html b/lib/opal-tb/tb/templates/pathway/observe_dot.html
@@ -24,8 +24,8 @@
           [[ item.date | shortDate ]]
         </td>
         <td>
-          <label class="btn btn-default" ng-model="item.observed" data-title="Observed" bs-tooltip btn-radio="true">{% icon "fa-check" %}</label>
-          <label class="btn btn-default" ng-model="item.observed" data-title="Not Observed" bs-tooltip btn-radio="false">{% icon "fa fa-close"%}</label>
+          <label class="btn btn-default" ng-model="item.observed" btn-radio="true">{% icon "fa-check" %}</label>
+          <label class="btn btn-default" ng-model="item.observed" btn-radio="false">{% icon "fa fa-close"%}</label>
         </td>
       </tr>
     </table>

diff --git a/lib/opal-tb/tb/templates/pathway/tb_treatment.html b/lib/opal-tb/tb/templates/pathway/tb_treatment.html
@@ -89,7 +89,8 @@ <h3 >
 
         <div class="row form-horizontal content-offset-20" ng-repeat="plan in localEditing.treatmentPlan" ng-show="existingTreatmentFilter(plan)">
           <div class="col-md-3">
-            <input type="text" class="form-control" ng-model="plan.drug" bs-typeahead  bs-options="i for i in antimicrobial_list" />
+            <input type="text" class="form-control" ng-model="plan.drug"
+                   uib-typeahead="i for i in antimicrobial_list | filter:$viewValue | limitTo:8" />
           </div>
           <div class="col-md-2">
             <input type="text" class="form-control" ng-model="plan.dose" />
@@ -101,10 +102,10 @@ <h3 >
             <input name="treatment_plan_planned_end_date[[ $index ]]"  type="text" class="form-control" required-if-not-empty="plan" ng-model="plan.planned_end_date" bs-datepicker   />
           </div>
           <div class="col-md-1">
-            <button ng-show="!plan.id || today(plan.end_date)" ng-click="removeTreatment($index)" class="btn btn-secondary" data-title="Remove" bs-tooltip>
+            <button ng-show="!plan.id || today(plan.end_date)" ng-click="removeTreatment($index)" class="btn btn-secondary">
               {% icon "fa-trash" %}
             </button>
-            <button ng-hide="!plan.id || today(plan.end_date)" ng-click="stopTreatment($index)" class="btn btn-secondary" data-title="Stop" bs-tooltip>
+            <button ng-hide="!plan.id || today(plan.end_date)" ng-click="stopTreatment($index)" class="btn btn-secondary">
               {% icon "fa-stop" %}
             </button>
           </div>

diff --git a/lib/opal-tb/tb/templates/tb/forms/pathway_treatment.html b/lib/opal-tb/tb/templates/tb/forms/pathway_treatment.html
@@ -3,7 +3,8 @@
   <label class="control-label">
     Drug
   </label>
-  <input class="form-control ng-pristine ng-valid ng-valid-maxlength ng-touched" type="text" ng-model="editing.treatment.drug" autocomplete="off" bs-typeahead="" bs-options="i for i in antimicrobial_list" name="treatment_drug" ng-maxlength="255">
+  <input class="form-control ng-pristine ng-valid ng-valid-maxlength ng-touched" type="text" ng-model="editing.treatment.drug" autocomplete="off"
+         uib-typeahead="i for i in antimicrobial_list | filter:$viewValue | limitTo:8" name="treatment_drug" ng-maxlength="255">
 </div>
 
 <div class="form-group">
@@ -15,13 +16,16 @@
 
 <div class="form-group">
   <label class="control-label">Route</label>
-  <input class="form-control ng-pristine ng-valid ng-valid-maxlength ng-touched" type="text" ng-model="editing.treatment.route" autocomplete="off" bs-typeahead="" bs-options="i for i in drugroute_list" name="treatment_route" ng-maxlength="255">
+  <input class="form-control ng-pristine ng-valid ng-valid-maxlength ng-touched" type="text" ng-model="editing.treatment.route" autocomplete="off"
+         uib-typeahead="i for i in drugroute_list | filter:$viewValue | limitTo:8" name="treatment_route" ng-maxlength="255">
 </div>
 
 <div class="form-group">
   <label class="control-label">Frequency</label>
-  <input class="form-control ng-pristine ng-valid ng-valid-maxlength ng-touched" type="text" ng-model="editing.treatment.frequency" autocomplete="off" bs-typeahead="" bs-options="i for i in drugfreq_list" name="treatment_frequency" ng-maxlength="255">
-  <input class="form-control ng-pristine ng-valid ng-valid-maxlength ng-touched" type="text" ng-model="editing.treatment.route" autocomplete="off" bs-typeahead="" bs-options="i for i in drugroute_list" name="treatment_route" ng-maxlength="255">
+  <input class="form-control ng-pristine ng-valid ng-valid-maxlength ng-touched" type="text" ng-model="editing.treatment.frequency" autocomplete="off"
+         uib-typeahead="i for i in drugfreq_list | filter:$viewValue | limitTo:8" name="treatment_frequency" ng-maxlength="255">
+  <input class="form-control ng-pristine ng-valid ng-valid-maxlength ng-touched" type="text" ng-model="editing.treatment.route" autocomplete="off"
+         uib-typeahead="i for i in drugroute_list | filter:$viewValue | limitTo:8" name="treatment_route" ng-maxlength="255">
 </div>