Merge branch 'v0.2.5.1' into deployment-script

openhealthcare · Oct 2, 2017 · 15b5ecc · 15b5ecc
2 parents 4cb401e + a8ad005
commit 15b5ecc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,7 @@ script:
   - opal test --coverage
 after_success:
   - find coverage
-  - coveralls-lcov -v -n coverage/Firefox\ 31.0.0\ \(Linux\ 0.0.0\)/lcov.info > coverage/coverage.json
+  - coveralls-lcov -v -n coverage/Firefox\ 55.0.0\ \(Linux\ 0.0.0\)/lcov.info > coverage/coverage.json
   - cat coverage/coverage.json
   - coveralls debug --merge=coverage/coverage.json
   - coveralls --merge=coverage/coverage.json

diff --git a/elcid/templates/episode_list.html b/elcid/templates/episode_list.html
@@ -50,16 +50,15 @@ <h3><i class="fa fa-user"></i>
                       [[ row.demographics[0].first_name ]] [[ row.demographics[0].surname ]] [[ row.demographics[0].hospital_number ]]
                       <small>
                         [[ row.demographics[0].date_of_birth|shortDate ]]
-                        <span ng-show="row.demographics[0].date_of_birth">
-                          ([[ row.demographics[0].date_of_birth | age ]])
+                        <span ng-show="row.location[0].ward">
+                          &nbsp; {% icon models.Location.get_icon %} [[ row.location[0].ward ]]
                         </span>
                         <span class="pull-right" ng-repeat="episode in [row]" ng-show="currentTag !== 'bacteraemia' && row.positive_blood_culture_history.length">
                           {% include "partials/historical_bacteraemia.html" %}
                         </span>
                       </small>
                     </h3>
                   </div>
-
                 </div>
               </div>
               <div uib-collapse="isCardCollapsed" class="panel-body">
@@ -72,7 +71,6 @@ <h4><strong>
                       {% include models.PrimaryDiagnosis.get_display_template %}
                     </p>
                   </div>
-
                   <div class="col-md-6">
                     <h4><strong>
                         {% icon models.Antimicrobial.get_icon %} Antimicrobials
@@ -90,7 +88,14 @@ <h4><strong>
                     <p ng-repeat="item in row.diagnosis">
                       {% include models.Diagnosis.get_display_template %}
                     </p>
-
+                  </div>
+                  <div class="col-md-6">
+                    <h4><strong>
+                        {% icon models.Location.get_icon %} {{ models.Location.get_display_name }}
+                    </strong></h4>
+                    <p ng-repeat="item in row.location">
+                      [[ row.location[0].ward ]]
+                    </p>
                   </div>
                 </div>
               </div>