Merge e759b2c into 93d0c45

openhealthcare · Feb 5, 2020 · a09ff2b · a09ff2b
2 parents 93d0c45 + e759b2c
commit a09ff2b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/apps/tb/templates/detail/tb.html b/apps/tb/templates/detail/tb.html
@@ -93,13 +93,13 @@
                       </div>
                     </div>
                     <div class="row content-offset-10">
-                      <div ng-show="item.reason_for_interaction == 'LTBI initial assessment'" class="col-md-12">
-                        <a target="_blank" href="/letters/#/tb/ltbi_initial_assessment/[[ item.id ]]/">
+                      <div ng-show="item.reason_for_interaction.indexOf('initial assessment') != -1" class="col-md-12">
+                        <a target="_blank" href="/letters/#/tb/initial_assessment/[[ item.id ]]/">
                           <i class="fa fa-envelope edit pull-right pointer"></i>
                         </a>
                       </div>
-                      <div ng-show="item.reason_for_interaction == 'LTBI follow up'" class="col-md-12">
-                          <a target="_blank" href="/letters/#/tb/ltbi_followup_assessment/[[ item.id ]]/">
+                      <div ng-show="item.reason_for_interaction.indexOf('follow up') != -1" class="col-md-12">
+                          <a target="_blank" href="/letters/#/tb/followup_assessment/[[ item.id ]]/">
                             <i class="fa fa-envelope edit pull-right pointer"></i>
                           </a>
                         </div>

diff --git a/apps/tb/templates/forms/patient_consultation_form.html b/apps/tb/templates/forms/patient_consultation_form.html
@@ -3,8 +3,8 @@
 {% select field="PatientConsultation.reason_for_interaction" %}
 {% datetimepicker field="PatientConsultation.when" %}
 {% textarea field="PatientConsultation.examination_findings" %}
-<div ng-show="editing.patient_consultation.reason_for_interaction == 'LTBI follow up'">
+<div ng-show="editing.patient_consultation.reason_for_interaction.indexOf('follow up') != -1">
     {% textarea field="PatientConsultation.progress" %}
 </div>
 {% textarea field="PatientConsultation.discussion" %}
-{% textarea field="PatientConsultation.plan" %}
+{% textarea field="PatientConsultation.plan" %}
diff --git a/.../templates/tb/letters/ltbi_follow_up.html → apps/tb/templates/tb/letters/follow_up.html b/.../templates/tb/letters/ltbi_follow_up.html → apps/tb/templates/tb/letters/follow_up.html
diff --git a/...s/tb/letters/ltbi_initial_assessment.html → ...plates/tb/letters/initial_assessment.html b/...s/tb/letters/ltbi_initial_assessment.html → ...plates/tb/letters/initial_assessment.html
diff --git a/apps/tb/urls.py b/apps/tb/urls.py
@@ -11,12 +11,12 @@
         views.ClinicalAdvicePrintView.as_view()
     ),
     url(
-        r'^tb/ltbi_initial_assessment/(?P<pk>\d+)/?$',
-        views.LTBIInitialAssessment.as_view()
+        r'^tb/initial_assessment/(?P<pk>\d+)/?$',
+        views.InitialAssessment.as_view()
     ),
     url(
-        r'^tb/ltbi_followup_assessment/(?P<pk>\d+)/?$',
-        views.LTBIFollowUp.as_view()
+        r'^tb/followup_assessment/(?P<pk>\d+)/?$',
+        views.FollowUp.as_view()
     ),
     url(
         r'^tb/primary_diagnosis/$',

diff --git a/apps/tb/views.py b/apps/tb/views.py
@@ -64,8 +64,8 @@ def get_context_data(self, *args, **kwargs):
         return ctx
 
 
-class LTBIInitialAssessment(AbstractLetterView):
-    template_name = "tb/letters/ltbi_initial_assessment.html"
+class InitialAssessment(AbstractLetterView):
+    template_name = "tb/letters/initial_assessment.html"
     model = PatientConsultation
 
     def get_context_data(self, *args, **kwargs):
@@ -82,8 +82,8 @@ def get_context_data(self, *args, **kwargs):
         return ctx
 
 
-class LTBIFollowUp(AbstractLetterView):
-    template_name = "tb/letters/ltbi_follow_up.html"
+class FollowUp(AbstractLetterView):
+    template_name = "tb/letters/follow_up.html"
     model = PatientConsultation
 
     def get_context_data(self, *args, **kwargs):