Merge e851f97 into 8096939

apps/tb/api.py

@@ -1,40 +1,24 @@
 """
 Specific API endpoints for the TB module
 """
-from django.utils import timezone
-from opal.core.views import json_response
-from opal.core.api import patient_from_pk, LoginRequiredViewset
+from collections import OrderedDict
+from plugins.labtests.api import RecentResultsApiView
 
-from apps.tb.utils import get_tb_summary_information
 
-
-class TbTestSummary(LoginRequiredViewset):
+class TbTestSummary(RecentResultsApiView):
     base_name = 'tb_test_summary'
-    """"
-    Example payload
-
-    return [
-        {
-            name: 'C REACTIVE PROTEIN',
-            date: '',
-            result: '1'
-        },
-        {
-            name: 'ALT',
-            date: '',
-            result: '1'
-        }
-    ]
-    """
-    @patient_from_pk
-    def retrieve(self, request, patient):
-        tb_summary_information = get_tb_summary_information(patient)
-        result = []
-        for obs_name, summary in tb_summary_information.items():
-            result.append({
-                "name": obs_name,
-                "date": summary["observation_datetime"],
-                "result": summary["observation_value"]
-            })
-
-        return json_response(dict(results=result))
+    RELEVANT_TESTS = OrderedDict((
+        ("AFB : CULTURE", ["TB: Culture Result"]),
+        ("TB PCR TEST", ["TB PCR"]),
+        ("C REACTIVE PROTEIN", ["C Reactive Protein"]),
+        ("LIVER PROFILE", ["ALT", "AST", "Total Bilirubin"]),
+        ("QUANTIFERON TB GOLD IT", [
+            "QFT IFN gamma result (TB1)",
+            "QFT IFN gamme result (TB2)",
+            "QFT TB interpretation"
+        ]),
+        ('HEPATITIS B SURFACE AG', ["Hepatitis B 's'Antigen........"]),
+        ('HEPATITIS C ANTIBODY', ["Hepatitis C IgG Antibody......"]),
+        ('HIV 1 + 2 ANTIBODIES', ['HIV 1 + 2 Antibodies..........']),
+        ("25-OH Vitamin D", ["25-OH Vitamin D"]),
+    ),)

apps/tb/plugin.py

@@ -26,13 +26,11 @@ class TbPlugin(plugins.OpalPlugin):
             'js/tb/controllers/tb_treatment.js',
             'js/tb/controllers/mantoux_test.js',
             'js/tb/controllers/add_episode_helper.js',
-            'js/tb/directives.js'
             # 'js/tb/services/larry.js',
         ],
         'opal.services': [
             'js/tb/services/treatment_utils.js',
             'js/tb/services/treatment_record.js',
-            'js/tb/services/test_summary_loader.js',
         ],
     }
 

apps/tb/templates/detail/tb.html

@@ -1,9 +1,10 @@
 {% load panels %}
 {% load forms %}
+{% load key_investigations %}
 <div class="row">
   <div class="col-md-6">
     {% include "panels/external_links.html" %}
-    {% include "partials/tb_summary_tests.html" %}
+    {% key_investigations "/api/v0.1/tb_test_summary/" body_class="panel-footer" %}
     {% include "panels/symptoms.html" %}
 
     {% include 'panels/primary_diagnosis.html' %}

apps/tb/tests/test_api.py

@@ -2,7 +2,6 @@
 from plugins.labtests import models
 from rest_framework.reverse import reverse
 from opal.core.test import OpalTestCase
-from apps.tb import utils
 
 
 class TestMultipleResults(OpalTestCase):

apps/tb/views.py

@@ -7,8 +7,6 @@
 from apps.tb.models import PatientConsultation
 from django.views.generic import TemplateView
 from opal.core.serialization import deserialize_datetime
-from apps.tb.utils import get_tb_summary_information
-
 from apps.tb.models import Treatment
 from elcid.models import Diagnosis
 from opal import views
@@ -41,11 +39,6 @@ def get_context_data(self, *args, **kwargs):
             category=Treatment.TB
         )
         ctx["communication_considerations"] = patient.communinicationconsiderations_set.get()
-        ctx["results"] = get_tb_summary_information(patient)
-        for result in ctx["results"].values():
-            result["observation_datetime"] = deserialize_datetime(
-                result["observation_datetime"]
-            )
         ctx["travel_list"] = episode.travel_set.all()
         ctx["adverse_reaction_list"] = episode.adversereaction_set.all()
         ctx["past_medication_list"] = episode.antimicrobial_set.all()

config/karma.conf.js

@@ -9,6 +9,8 @@ module.exports = function(config){
     __dirname + '/../elcid/assets/js/elcid/services/records/*',
     __dirname + '/../intrahospital_api/static/js/intrahospital_api/controllers/*',
     __dirname + '/../apps/tb/static/js/tb/controllers/*',
+    __dirname + '/../plugins/labtests/static/js/labtests/controllers/*',
+    __dirname + '/../plugins/labtests/static/js/labtests/services/*',
   ];
   var includedFiles = [
     'opal/app.js',
@@ -17,6 +19,8 @@ module.exports = function(config){
     __dirname + '/../intrahospital_api/static/js/intrahospital_api/*.js',
     __dirname + '/../apps/tb/static/js/tb/**/*',
     __dirname + '/../apps/tb/static/js/test/**/*',
+    __dirname + '/../plugins/labtests/static/js/**/*',
+    __dirname + '/../plugins/labtests/static/js/**/*',
   ];
 
   var defaultConfig = karmaDefaults(includedFiles, baseDir, coverageFiles);

elcid/api.py

@@ -4,6 +4,7 @@
 import datetime
 import re
 from collections import defaultdict, OrderedDict
+from plugins.labtests.api import RecentResultsApiView
 from operator import itemgetter
 
 from django.conf import settings
@@ -463,10 +464,35 @@ def create(self, request):
         )
 
 
+class AntifungalKeyInvestigations(RecentResultsApiView):
+    base_name = 'antifungal_key_investigations'
+    RELEVANT_TESTS = OrderedDict((
+        ("BETA D GLUCAN TEST", [
+            "Beta Glucan test:"
+            "Beta Glucan concentration",
+        ]),
+        ("GALACTOMANNAN AGN. ELISA", [
+            "Galactomannan Agn. ELISA"
+            "Galactomannan Agn. INDEX",
+        ]),
+        ("T2MR", ["T2MR PCR result"]),
+        ("ANTIFUNGAL DRUG ASSAY", [
+            "Antifungal Drug Assay of",
+            "Specimen Level"
+        ])
+    ),)
+
+
 elcid_router = OPALRouter()
 elcid_router.register(
     UpstreamBloodCultureApi.base_name, UpstreamBloodCultureApi
 )
+elcid_router.register(
+    AntifungalKeyInvestigations.base_name, AntifungalKeyInvestigations
+)
+elcid_router.register(
+    AntifungalKeyInvestigations.base_name, AntifungalKeyInvestigations
+)
 elcid_router.register(DemographicsSearch.base_name, DemographicsSearch)
 elcid_router.register(BloodCultureIsolateApi.base_name, BloodCultureIsolateApi)
 

elcid/templates/detail/infection_service.html

@@ -1,5 +1,6 @@
 {% load panels %}
 {% load forms %}
+{% load key_investigations %}
 <div class="col-md-6">
   {% record_panel models.Location %}
   {% teams_panel %}
@@ -14,6 +15,10 @@
     </div>
   {% endif %}
 
+  <div ng-if="patient.is_antifungal">
+    {% key_investigations "/elcid/v0.1/antifungal_key_investigations/" title="Antifungal Investgations" body_class="panel-body" %}
+  </div>
+
 
   {% record_panel models.PrimaryDiagnosis %}