Migrate Calculations to DX

src/bika/lims/browser/analysisrequest/add2.py

@@ -29,8 +29,6 @@
 from bika.lims import api
 from bika.lims import bikaMessageFactory as _
 from bika.lims import logger
-from bika.lims.api.analysisservice import get_calculation_dependencies_for
-from bika.lims.api.analysisservice import get_service_dependencies_for
 from bika.lims.api.security import check_permission
 from bika.lims.decorators import returns_json
 from bika.lims.interfaces import IAddSampleConfirmation
@@ -52,6 +50,8 @@
 from Products.Five.browser import BrowserView
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from senaite.core.api import dtime
+from senaite.core.api.analysisservice import get_calculation_dependencies_for
+from senaite.core.api.analysisservice import get_service_dependencies_for
 from senaite.core.catalog import CONTACT_CATALOG
 from senaite.core.catalog import SETUP_CATALOG
 from senaite.core.p3compat import cmp

src/bika/lims/controlpanel/bika_calculations.py

@@ -18,15 +18,8 @@
 # Copyright 2018-2024 by it's authors.
 # Some rights reserved, see README and LICENSE.
 
-import collections
-
-from bika.lims import api
-from bika.lims import bikaMessageFactory as _
-from bika.lims.browser.bika_listing import BikaListingView
 from bika.lims.config import PROJECTNAME
 from bika.lims.interfaces import ICalculations
-from senaite.core.permissions import AddCalculation
-from bika.lims.utils import get_link
 from plone.app.folder.folder import ATFolder
 from plone.app.folder.folder import ATFolderSchema
 from Products.Archetypes import atapi
@@ -35,93 +28,6 @@
 from zope.interface.declarations import implements
 
 
-# TODO: Separate content and view into own modules!
-
-
-class CalculationsView(BikaListingView):
-
-    def __init__(self, context, request):
-        super(CalculationsView, self).__init__(context, request)
-
-        self.catalog = "senaite_catalog_setup"
-        self.contentFilter = {
-            "portal_type": "Calculation",
-            "sort_on": "sortable_title",
-            "sort_order": "ascending",
-        }
-
-        self.context_actions = {
-            _("Add"): {
-                "url": "createObject?type_name=Calculation",
-                "permission": AddCalculation,
-                "icon": "++resource++bika.lims.images/add.png"}
-        }
-
-        self.title = self.context.translate(_("Calculations"))
-        self.icon = "{}/{}".format(
-            self.portal_url,
-            "/++resource++bika.lims.images/calculation_big.png"
-        )
-
-        self.show_select_row = False
-        self.show_select_column = True
-        self.pagesize = 25
-
-        self.columns = collections.OrderedDict((
-            ("Title", {
-                "title": _("Calculation"),
-                "index": "sortable_title"}),
-            ("Description", {
-                "title": _("Description"),
-                "index": "Description",
-                "toggle": True}),
-            ("Formula", {
-                "title": _("Formula"),
-                "index": "getFormula",
-                "toggle": True}),
-        ))
-
-        self.review_states = [
-            {
-                "id": "default",
-                "title": _("Active"),
-                "contentFilter": {"is_active": True},
-                "transitions": [{"id": "deactivate"}, ],
-                "columns": self.columns.keys(),
-            }, {
-                "id": "inactive",
-                "title": _("Inactive"),
-                "contentFilter": {'is_active': False},
-                "transitions": [{"id": "activate"}, ],
-                "columns": self.columns.keys(),
-            }, {
-                "id": "all",
-                "title": _("All"),
-                "contentFilter": {},
-                "columns": self.columns.keys(),
-            }
-        ]
-
-    def folderitem(self, obj, item, index):
-        """Service triggered each time an item is iterated in folderitems.
-        The use of this service prevents the extra-loops in child objects.
-        :obj: the instance of the class to be foldered
-        :item: dict containing the properties of the object to be used by
-            the template
-        :index: current index of the item
-        """
-        obj = api.get_object(obj)
-        title = obj.Title()
-        description = obj.Description()
-        url = obj.absolute_url()
-
-        item["replace"]["Title"] = get_link(url, value=title)
-        item["Description"] = description
-        item["Formula"] = obj.getMinifiedFormula()
-
-        return item
-
-
 schema = ATFolderSchema.copy()
 
 

src/bika/lims/controlpanel/configure.zcml

@@ -44,14 +44,6 @@
       layer="bika.lims.interfaces.IBikaLIMS"
     />
 
-    <browser:page
-      for="bika.lims.interfaces.ICalculations"
-      name="folder_view"
-      class=".bika_calculations.CalculationsView"
-      permission="senaite.core.permissions.ManageBika"
-      layer="bika.lims.interfaces.IBikaLIMS"
-    />
-
     <browser:page
       for="bika.lims.interfaces.IAnalysisServices"
       name="folder_view"

src/bika/lims/profiles/default/factorytool.xml

@@ -10,7 +10,6 @@
   <type portal_type="Attachment"/>
   <type portal_type="Batch"/>
   <type portal_type="BikaSetup"/>
-  <type portal_type="Calculation"/>
   <type portal_type="Client"/>
   <type portal_type="Contact"/>
   <type portal_type="IdentifierType"/>

src/bika/lims/profiles/default/propertiestool.xml

@@ -43,7 +43,6 @@
     <element value="AttachmentType"/>
     <element value="Batch"/>
     <element value="BikaSetup"/>
-    <element value="Calculation"/>
     <element value="Client"/>
     <element value="Container"/>
     <element value="ContainerType"/>

src/bika/lims/profiles/default/structure/bika_setup/.objects

@@ -1,7 +1,6 @@
 auditlog,AuditLog
 bika_analysisservices,AnalysisServices
 bika_analysisspecs,AnalysisSpecs
-bika_calculations,Calculations
 bika_instruments,Instruments
 bika_labcontacts,LabContacts
 bika_referencedefinitions,ReferenceDefinitions

src/bika/lims/profiles/default/structure/bika_setup/.preserve

@@ -2,7 +2,6 @@ auditlog
 bika_analysisservices
 bika_analysisspecs
 bika_artemplates
-bika_calculations
 bika_instruments
 bika_labcontacts
 bika_referencedefinitions

src/bika/lims/profiles/default/types.xml

@@ -15,8 +15,6 @@
  <object name="Batch" meta_type="Factory-based Type Information with dynamic views"/>
  <object name="BatchFolder" meta_type="Factory-based Type Information with dynamic views"/>
  <object name="BikaSetup" meta_type="Factory-based Type Information with dynamic views"/>
- <object name="Calculation" meta_type="Factory-based Type Information with dynamic views"/>
- <object name="Calculations" meta_type="Factory-based Type Information with dynamic views"/>
  <object name="Client" meta_type="Factory-based Type Information with dynamic views"/>
  <object name="ClientFolder" meta_type="Factory-based Type Information with dynamic views"/>
  <object name="Contact" meta_type="Factory-based Type Information with dynamic views"/>