Merge branch 'v0.18.1'

openhealthcare · Mar 3, 2020 · 90b51b1 · 90b51b1
2 parents e8ffe92 + ee20300
commit 90b51b1
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 25 deletions.
diff --git a/doc/mkdocs.yml b/doc/mkdocs.yml
@@ -122,7 +122,7 @@ dev_addr: 0.0.0.0:8965
 include_next_prev: false
 
 extra:
-  version: v0.18.0
+  version: v0.18.1
 
 markdown_extensions:
     - fenced_code
diff --git a/opal/_version.py b/opal/_version.py
@@ -1,4 +1,4 @@
 """
 Declare our current version string
 """
-__version__ = '0.18.0'
+__version__ = '0.18.1'
diff --git a/opal/core/application.py b/opal/core/application.py
@@ -73,8 +73,6 @@ class OpalApplication(object):
             "js/opal/controllers/patient_list_redirect.js",
             "js/opal/controllers/patient_list.js",
             "js/opal/controllers/patient_detail.js",
-            "js/opal/controllers/hospital_number.js",
-            "js/opal/controllers/add_episode.js",
             "js/opal/controllers/edit_item.js",
             "js/opal/controllers/edit_teams.js",
             "js/opal/controllers/delete_item_confirmation.js",

diff --git a/opal/core/pathway/plugin.py b/opal/core/pathway/plugin.py
@@ -23,7 +23,6 @@ class PathwayPlugin(plugins.OpalPlugin):
             'js/pathway/controllers/pathway_redirect.js',
             'js/pathway/controllers/default_step.js',
             'js/pathway/controllers/default_single_step.js',
-            'js/pathway/controllers/find_patient.js',
             'js/pathway/controllers/pathway_ctrl.js',
             'js/pathway/controllers/modal_pathway_ctrl.js',
             'js/pathway/directives.js',

diff --git a/opal/templates/detail/inpatient.html b/opal/templates/detail/inpatient.html
@@ -69,7 +69,6 @@ <h3>
       </div>
     </div>
   </div>
-  {% teams_panel %}
   {% record_panel models.Allergies noentries="No known allergies"%}
   {% record_panel models.PastMedicalHistory %}
 </div>                 <!-- Ends Detail panels col 1 -->

diff --git a/opal/templates/patient_lists/layouts/spreadsheet_list_base.html b/opal/templates/patient_lists/layouts/spreadsheet_list_base.html
@@ -43,23 +43,6 @@ <h1>
               </a>
             </p>
           </li>
-          <li class="list-group-item">
-            <h4>
-              <i class="fa fa-users"></i> Teams
-              {% if patient_list.allow_edit_teams %}
-              <i class="fa edit fa-pencil pointer pull-right"
-                 ng-click="editTags()"></i>
-              {% endif %}
-            </h4>
-            <hr />
-            <h4
-               ng-repeat="tag in episode.getTags()"
-               ng-show="metadata.tag_visible_in_list.indexOf(tag) != -1"
-               >
-              <a href="/#/list/[[ metadata.tags[tag].slug ]]" >[[ metadata.tags[tag].display_name ]]</a>
-            </h4>
-          </li>
-
           {% block episode_actions %}
           <li class="list-group-item">
             {% include 'partials/_episode_actions.html' %}

diff --git a/opal/tests/test_core_application.py b/opal/tests/test_core_application.py
@@ -26,8 +26,6 @@ def test_get_core_javascripts(self):
             "js/opal/controllers/patient_list_redirect.js",
             "js/opal/controllers/patient_list.js",
             "js/opal/controllers/patient_detail.js",
-            "js/opal/controllers/hospital_number.js",
-            "js/opal/controllers/add_episode.js",
             "js/opal/controllers/edit_item.js",
             "js/opal/controllers/edit_teams.js",
             "js/opal/controllers/delete_item_confirmation.js",