diff --git a/src/senaite/patient/browser/patientfolder.py b/src/senaite/patient/browser/patientfolder.py index 85d71f6..2a901b5 100644 --- a/src/senaite/patient/browser/patientfolder.py +++ b/src/senaite/patient/browser/patientfolder.py @@ -110,6 +110,11 @@ def __init__(self, context, request): "title": _("Inactive"), "contentFilter": {'is_active': False}, "columns": self.columns.keys(), + }, { + "id": "deceased", + "title": _("Deceased"), + "contentFilter": {'patient_deceased': True}, + "columns": self.columns.keys(), }, { "id": "all", "title": _("All"), @@ -170,11 +175,16 @@ def folderitem(self, obj, item, index): self.get_identifier_tags(identifiers)) # Fullname - fullname = obj.getFullname() - if fullname: - fullname = api.safe_unicode(fullname).encode("utf8") - item["fullname"] = fullname - item["replace"]["fullname"] = get_link(url, value=fullname) + fullname_nd = t(_sp("fullname_not_defined", default="Not defined")) + fullname = obj.getFullname() or fullname_nd + fullname = api.safe_unicode(fullname).encode("utf8") + + # Death dagger + if obj.getDeceased(): + fullname = "{} ".format(fullname) + + item["fullname"] = fullname + item["replace"]["fullname"] = get_link(url, value=fullname) # Email email = obj.getEmail()