Remove getDueDate index and metadata

src/bika/lims/browser/analyses/view.py

@@ -189,7 +189,6 @@ def __init__(self, context, request, **kwargs):
  "sortable": False}),
  ("DueDate", {
  "title": _("Due Date"),
- "index": "getDueDate",
  "sortable": False}),
  ("state_title", {
  "title": _("Status"),
@@ -935,9 +934,12 @@ def _folder_item_duedate(self, analysis_brain, item):
  # Note that if the analysis is a Reference Analysis, `getDueDate`
  # returns the date when the ReferenceSample expires. If the analysis is
  # a duplicate, `getDueDate` returns the due date of the source analysis
- due_date = analysis_brain.getDueDate
+ obj = self.get_object(analysis_brain)
+ due_date = obj.getDueDate()
  if not due_date:
+ # analysis has no TAT set or is not yet ready for process
  return None
+
  due_date_str = self.ulocalized_time(due_date, long_format=0)
  item['DueDate'] = due_date_str
 

src/bika/lims/browser/worksheet/views/add_analyses.py

@@ -113,7 +113,7 @@ def __init__(self, context, request):
  "index": "getDateReceived"}),
  ("getDueDate", {
  "title": _("Due Date"),
- "index": "getDueDate"}),
+ "index": "sortable_due_date"}),
  ))
 
  self.review_states = [
@@ -268,21 +268,22 @@ def folderitem(self, obj, item, index):
  the template
  :index: current index of the item
  """
+ obj = api.get_object(obj)
+ received = obj.getDateReceived()
+ due_date = obj.getDueDate()
 
- DueDate = obj.getDueDate
+ item["getDateReceived"] = self.ulocalized_time(received)
+ item["getDueDate"] = self.ulocalized_time(due_date)
 
- item["getDateReceived"] = self.ulocalized_time(obj.getDateReceived)
- item["getDueDate"] = self.ulocalized_time(DueDate)
-
- if DueDate and DueDate < DateTime():
+ if due_date and due_date < DateTime():
  item["after"]["DueDate"] = get_image(
  "late.png", title=t(_("Late Analysis")))
 
  # set category title
  item["getCategoryTitle"] = self.get_category_title(obj)
 
  # Add Priority column
- priority_sort_key = obj.getPrioritySortkey
+ priority_sort_key = obj.getPrioritySortkey()
  if not priority_sort_key:
  # Default priority is Medium = 3.
  # The format of PrioritySortKey is <priority>.<created>

src/bika/lims/content/abstractroutineanalysis.py

@@ -137,25 +137,19 @@ def getClientOrderNumber(self):
  @security.public
  def getDateReceived(self):
  """Used to populate catalog values.
- Returns the date the Analysis Request this analysis belongs to was
- received. If the analysis was created after, then returns the date
- the analysis was created.
+ Returns the date the Sample this analysis belongs to was received
  """
- request = self.getRequest()
- if request:
- ar_date = request.getDateReceived()
- if ar_date and self.created() > ar_date:
- return self.created()
- return ar_date
+ sample = self.getRequest()
+ if sample:
+ return sample.getDateReceived()
  return None
 
  @security.public
  def isSampleReceived(self):
  """Returns whether if the Analysis Request this analysis comes from has
  been received or not
  """
- sample = self.getRequest()
- if sample.getDateReceived():
+ if self.getDateReceived():
  return True
  return False
 
@@ -185,14 +179,18 @@ def isSampleSampled(self):
 
  @security.public
  def getStartProcessDate(self):
- """Returns the date time when the analysis request the analysis belongs
- to was received. If the analysis request hasn't yet been received,
- returns None
- Overrides getStartProcessDateTime from the base class
- :return: Date time when the analysis is ready to be processed.
+ """Returns the date time when this analysis is considered ready for
+ testing. It returns the datetime when the sample the analysis belongs
+ to was received or when the analysis was created if after reception.
+ Returns None if the sample has not been received yet.
+ :return: Date time when the analysis is considered ready for testing
  :rtype: DateTime
  """
- return self.getDateReceived()
+ received = self.getDateReceived()
+ if not received:
+ return None
+ # return the analysis creation date if is after reception
+ return max([received, self.created()])
 
  @security.public
  def getSamplePoint(self):
@@ -203,10 +201,9 @@ def getSamplePoint(self):
 
  @security.public
  def getDueDate(self):
- """Used to populate getDueDate index and metadata.
- This calculates the difference between the time the analysis processing
- started and the maximum turnaround time. If the analysis has no
- turnaround time set or is not yet ready for proces, returns None
+ """This calculates the difference between the time the analysis
+ processing started and the maximum turnaround time. If the analysis has
+ no turnaround time set or is not yet ready for process, returns None
  """
  tat = self.getMaxTimeAllowed()
  if not tat:

src/bika/lims/content/analysisrequest.py

@@ -1713,10 +1713,21 @@ def getManagers(self):
  return manager_list
 
  def getDueDate(self):
- """Returns the earliest due date of the analyses this Analysis Request
- contains."""
- due_dates = map(lambda an: an.getDueDate, self.getAnalyses())
- return due_dates and min(due_dates) or None
+ """Returns the due date of this sample, that is the earliest due date
+ of the analyses it contains. Returns None if the sample has not been
+ received yet
+ """
+ if not self.getDateReceived():
+ return None
+
+ analyses = self.getAnalyses(sort_on="sortable_due_date",
+ sort_order="ascending")
+ if not analyses:
+ return None
+
+ # return the due date of the earliest due analysis
+ analysis = api.get_object(analyses[0])
+ return analysis.getDueDate()
 
  security.declareProtected(View, 'getLate')
 

src/senaite/core/browser/samples/view.py

@@ -450,7 +450,7 @@ def __init__(self, context, request):
  "to_be_verified",
  "verified",
  ),
- "getDueDate": {
+ "sortable_due_date": {
  "query": DateTime(),
  "range": "max",
  },
@@ -545,10 +545,14 @@ def folderitem(self, obj, item, index):
  # val = obj.Schema().getField('SubGroup').get(obj)
  # item['SubGroup'] = val.Title() if val else ''
 
+ full_object = api.get_object(obj)
+
+ # due date
+ due_date = full_object.getDueDate()
  item["SamplingDate"] = self.str_date(obj.getSamplingDate)
  item["getDateSampled"] = self.str_date(obj.getDateSampled)
  item["getDateReceived"] = self.str_date(obj.getDateReceived)
- item["getDueDate"] = self.str_date(obj.getDueDate)
+ item["getDueDate"] = self.str_date(due_date)
  item["getDatePublished"] = self.str_date(obj.getDatePublished)
  item["getDateVerified"] = self.str_date(obj.getDateVerified)
 
@@ -579,7 +583,6 @@ def folderitem(self, obj, item, index):
  after_icons += get_image("delete.png",
  title=t(_("Results have been withdrawn")))
 
- due_date = obj.getDueDate
  if due_date and due_date < (obj.getDatePublished or DateTime()):
  due_date_str = self.ulocalized_time(due_date)
  img_title = "{}: {}".format(t(_("Late Analyses")), due_date_str)
@@ -622,7 +625,6 @@ def folderitem(self, obj, item, index):
  if item["review_state"] == "to_be_sampled":
  # We need to get the full object in order to check
  # the permissions
- full_object = api.get_object(obj)
  if check_permission(TransitionSampleSample, full_object):
  # make fields required and editable
  item["required"] = ["getSampler", "getDateSampled"]

src/senaite/core/catalog/analysis_catalog.py

@@ -36,7 +36,6 @@
  ("getClientTitle", "", "FieldIndex"),
  ("getClientUID", "", "FieldIndex"),
  ("getDateReceived", "", "DateIndex"),
- ("getDueDate", "", "DateIndex"),
  ("getInstrumentUID", "", "FieldIndex"),
  ("getKeyword", "", "FieldIndex"),
  ("getPointOfCapture", "", "FieldIndex"),
@@ -48,6 +47,7 @@
  ("getServiceUID", "", "FieldIndex"),
  ("getWorksheetUID", "", "FieldIndex"),
  ("sortable_title", "", "FieldIndex"),
+ ("sortable_due_date", "", "DateIndex"),
 ]
 
 COLUMNS = BASE_COLUMNS + [
@@ -58,7 +58,6 @@
  "getClientURL",
  "getDateReceived",
  "getDateSampled",
- "getDueDate",
  "getKeyword",
  "getLastVerificator",
  "getMethodTitle",

src/senaite/core/catalog/indexer/configure.zcml

@@ -23,9 +23,11 @@
  <adapter name="assigned_state" factory=".sample.assigned_state"/>
  <adapter name="is_received" factory=".sample.is_received"/>
  <adapter name="listing_searchable_text" factory=".sample.listing_searchable_text"/>
+ <adapter name="sortable_due_date" factory=".sample.sortable_due_date"/>
 
  <!-- Request Analysis Indexer -->
  <adapter name="getAncestorsUIDs" factory=".requestanalysis.getAncestorsUIDs"/>
+ <adapter name="sortable_due_date" factory=".requestanalysis.sortable_due_date"/>
 
  <!-- AnalysisCategory Indexer -->
  <adapter name="sortable_title" factory=".analysiscategory.sortable_title"/>

src/senaite/core/catalog/indexer/requestanalysis.py

@@ -18,9 +18,13 @@
 # Copyright 2018-2024 by it's authors.
 # Some rights reserved, see README and LICENSE.
 
+from datetime import datetime
+from datetime import timedelta
+
 from bika.lims import api
 from bika.lims.interfaces.analysis import IRequestAnalysis
 from plone.indexer import indexer
+from senaite.core.api import dtime
 
 
 @indexer(IRequestAnalysis)
@@ -31,3 +35,23 @@ def getAncestorsUIDs(instance):
  request = instance.getRequest()
  parents = map(lambda ar: api.get_uid(ar), request.getAncestors())
  return [api.get_uid(request)] + parents
+
+
+@indexer(IRequestAnalysis)
+def sortable_due_date(instance):
+ """Returns the due date of the analysis, but without taking workdays into
+ account. This is a hint for sorting by due date, but it's value might not
+ match with the real due date.
+ """
+ tat = instance.getMaxTimeAllowed()
+ if not tat:
+ return dtime.to_DT(datetime.max)
+
+ start = instance.getStartProcessDate()
+ if not start:
+ return dtime.to_DT(datetime.max)
+
+ start = dtime.to_dt(start)
+ tat = api.to_minutes(**tat)
+ due_date = start + timedelta(minutes=tat)
+ return dtime.to_DT(due_date)

src/senaite/core/catalog/indexer/sample.py

@@ -26,6 +26,7 @@
 from senaite.core.catalog import SAMPLE_CATALOG
 from senaite.core.interfaces import ISampleCatalog
 from zope.component import getAdapters
+from senaite.core.catalog.indexer import requestanalysis
 
 
 @indexer(IAnalysisRequest)
@@ -148,3 +149,18 @@ def listing_searchable_text(instance):
  entries = filter(None, entries)
 
  return u" ".join(map(api.safe_unicode, entries))
+
+
+@indexer(IAnalysisRequest)
+def sortable_due_date(instance):
+ """Returns the earliest due date of the analyses that belong to this
+ instance, but without taking workdays into account. This is a hint for
+ sorting by due date, but it's value might not match with the real due date
+ """
+ analyses = instance.getAnalyses(sort_on="sortable_due_date",
+ sort_order="ascending")
+ if not analyses:
+ return None
+
+ analysis = api.get_object(analyses[0])
+ return requestanalysis.sortable_due_date(analysis)()

src/senaite/core/catalog/sample_catalog.py

@@ -41,7 +41,6 @@
  ("getDateSampled", "", "DateIndex"),
  ("getDateVerified", "", "DateIndex"),
  ("getDistrict", "", "FieldIndex"),
- ("getDueDate", "", "DateIndex"),
  ("getPrinted", "", "FieldIndex"),
  ("getPrioritySortkey", "", "FieldIndex"),
  ("getProvince", "", "FieldIndex"),
@@ -54,6 +53,7 @@
  ("listing_searchable_text", "", "ZCTextIndex"),
  ("modified", "", "DateIndex"),
  ("sortable_title", "", "FieldIndex"),
+ ("sortable_due_date", "", "DateIndex"),
 ]
 
 COLUMNS = BASE_COLUMNS + [
@@ -77,7 +77,6 @@
  "getDateVerified",
  "getDescendantsUIDs",
  "getDistrict",
- "getDueDate",
  "getHazardous",
  "getInternalUse",
  "getInvoiceExclude",

src/senaite/core/catalog/senaite_catalog.py

@@ -42,7 +42,6 @@
  ("getClientUID", "", "FieldIndex"),
  ("getDateReceived", "", "DateIndex"),
  ("getDateSampled", "", "DateIndex"),
- ("getDueDate", "", "DateIndex"),
  ("getExpiryDate", "", "DateIndex"),
  ("getId", "", "FieldIndex"),
  ("getReferenceDefinitionUID", "", "FieldIndex"),

src/senaite/core/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
- <version>2649</version>
+ <version>2650</version>
  <dependencies>
  <dependency>profile-Products.ATContentTypes:base</dependency>
  <dependency>profile-Products.CMFEditions:CMFEditions</dependency>

src/senaite/core/upgrade/v02_06_000.py

@@ -31,6 +31,7 @@
 from Products.Archetypes.utils import getRelURL
 from Products.CMFCore.permissions import View
 from senaite.core import logger
+from senaite.core.api.catalog import del_column
 from senaite.core.api.catalog import del_index
 from senaite.core.api.catalog import reindex_index
 from senaite.core.catalog import ANALYSIS_CATALOG
@@ -2465,3 +2466,21 @@ def remove_is_sample_received_index(tool):
  cat = api.get_tool(ANALYSIS_CATALOG)
  del_index(cat, "isSampleReceived")
  logger.info("Removing isSampleReceived index from catalogs [DONE]")
+
+
+def remove_get_due_date_index(tool):
+ logger.info("Removing getDueDate index from catalogs ...")
+ index = "getDueDate"
+ portal = tool.aq_inner.aq_parent
+ for cat in portal.objectValues():
+ if not isinstance(cat, BaseCatalog):
+ continue
+ logger.info("Removing getDueDate index from {}".format(cat.id))
+ del_index(cat, index)
+ logger.info("Removing getDueDate column from {}".format(cat.id))
+ del_column(cat, index)
+
+ # create the new indexes if necessary
+ setup_core_catalogs(portal)
+
+ logger.info("Removing getDueDate index from catalogs [DONE]")

src/senaite/core/upgrade/v02_06_000.zcml

@@ -3,6 +3,14 @@
  xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
  i18n_domain="senaite.core">
 
+ <genericsetup:upgradeStep
+ title="SENAITE.CORE 2.6.0: Remove getDueDate index"
+ description="Remove getDueDate index"
+ source="2649"
+ destination="2650"
+ handler=".v02_06_000.remove_get_due_date_index"
+ profile="senaite.core:default"/>
+
  <genericsetup:upgradeStep
  title="SENAITE.CORE 2.6.0: Remove isSampleReceived index"
  description="Remove isSampleReceived index"