Merge pull request #161 from senaite/port-panic

Compatibility with senaite.panic add-on

CHANGES.rst

@@ -6,6 +6,7 @@ Changelog
 
 **Added**
 
+- #161 Compatibility with `senaite.panic` add-on
 - #166 Better handling of ClientPatientID and Patient fields in Add Sample
 
 **Changed**

bika/health/browser/configure.zcml

@@ -2,7 +2,6 @@
     xmlns="http://namespaces.zope.org/zope"
     i18n_domain="senaite.health">
 
-  <include package=".analysis"/>
   <include package=".aetiologicagent"/>
   <include package=".analysisrequest"/>
   <include package=".analysisrequests"/>

bika/health/configure.zcml

@@ -37,7 +37,6 @@
   <include package=".static" />
   <include package=".subscribers" />
   <include package=".upgrade" />
-  <include package=".widgets" />
 
   <!-- TODO REMOVE obsolete module -->
   <include package=".obsolete" />

bika/health/content/analysisrequest.py

@@ -102,16 +102,6 @@ def __init__(self, context):
             ),
         ),
 
-        ExtBooleanField(
-            'PanicEmailAlertToClientSent',
-            default=False,
-            widget=BooleanWidget(
-                visible={'edit': 'invisible',
-                         'view': 'invisible',
-                         'add': 'invisible'},
-            ),
-        ),
-
         ExtStringField(
             'ClientPatientID',
             searchable=True,

bika/health/content/bikasetup.py

@@ -18,40 +18,20 @@
 # Copyright 2018-2019 by it's authors.
 # Some rights reserved, see README and LICENSE.
 
-from Products.Archetypes.Widget import BooleanWidget
-from archetypes.schemaextender.interfaces import ISchemaExtender,\
-    IOrderableSchemaExtender
-from bika.lims.fields import *
+from archetypes.schemaextender.interfaces import IOrderableSchemaExtender
+from zope.component import adapts
+from zope.interface import implements
+
 from bika.health import bikaMessageFactory as _
+from bika.lims.fields import *
 from bika.lims.interfaces import IBikaSetup
-from zope.component import adapts, getAdapters
-from zope.interface import implements
 
 
 class BikaSetupSchemaExtender(object):
     adapts(IBikaSetup)
     implements(IOrderableSchemaExtender)
 
     fields = [
-        ExtBooleanField('EnablePanicAlert',
-            schemata="Analyses",
-            default=False,
-            widget=BooleanWidget(
-                label=_("Enable panic levels alert"),
-                description=_("Alert labmanagers with an email when an "
-                              "analysis result exceeding a panic level is "
-                              "submitted"))
-        ),
-        ExtBooleanField('AutoShowPanicAlertEmailPopup',
-            schemata="Analyses",
-            default=False,
-            widget=BooleanWidget(
-                label=_("Show client email pop-up when panic level"),
-                description=_("If enabled, shows automatically an email form "
-                              "pop-up for alerting the client about a panic "
-                              "level exceeded when Analysis Request view is "
-                              "loaded"))
-        ),
         ExtStringField('PatientConditionsHeightUnits',
             schemata="Cases",
             default=_("Feet/inches"),
@@ -114,17 +94,6 @@ class BikaSetupSchemaExtender(object):
                                 "preferences' tab.")
                 )
         ),
-        ExtBooleanField('EnableBikaAnalysisRequestRequestForm',
-            schemata="Analyses",
-            default=False,
-            widget=BooleanWidget(
-                label=_("Enable Bika's analysis request form."),
-                description=_("It enables the secondary analysis request form. This request has some characteristic "
-                              "features as allowing you to register more than one analysis request at the same time. "
-                              "It's useful if you are supposed to register a big amount of analysis request at the same "
-                              "time.")
-            )
-        ),
         ExtBooleanField('CaseDoctorIsMandatory',
             schemata="Cases",
             default=True,

bika/health/content/configure.zcml

@@ -11,7 +11,6 @@
     <adapter factory=".batch.BatchSchemaModifier" />
 
     <adapter factory=".analysis.AnalysisSchemaExtender" />
-    <adapter factory=".analysisspec.AnalysisSpecSchemaModifier" />
     <adapter factory=".bikasetup.BikaSetupSchemaExtender" />
     <adapter factory=".client.ClientSchemaExtender" />
 

bika/health/profiles/default/metadata.xml

@@ -9,5 +9,6 @@
   <version>1.2.3</version>
   <dependencies>
     <dependency>profile-senaite.lims:default</dependency>
+    <dependency>profile-senaite.panic:default</dependency>
   </dependencies>
 </metadata>