Refactored Contacts listing

CHANGES.rst

@@ -10,6 +10,7 @@ Changelog
 
 **Changed**
 
+- #1012 Refactored Contacts listing
 - #1010 Increased max length of Results options to 255 chars (was 40)
 
 **Removed**

bika/lims/browser/client/views/contacts.py

@@ -5,9 +5,12 @@
 # Copyright 2018 by it's authors.
 # Some rights reserved. See LICENSE.rst, CONTRIBUTORS.rst.
 
+from collections import OrderedDict
+
 from bika.lims import bikaMessageFactory as _
 from bika.lims.browser.bika_listing import BikaListingView
 from bika.lims.interfaces import IContacts
+from bika.lims.utils import get_link, get_email_link
 from bika.lims.vocabularies import CatalogVocabulary
 from zope.interface import implements
 
@@ -42,57 +45,50 @@ def __init__(self, context, request):
         self.title = self.context.translate(_("Contacts"))
         self.description = ""
 
-        self.columns = {
-            'getFullname': {'title': _('Full Name'),
-                            'index': 'getFullname'},
-            'Username': {'title': _('User Name')},
-            'getEmailAddress': {'title': _('Email Address')},
-            'getBusinessPhone': {'title': _('Business Phone')},
-            'getMobilePhone': {'title': _('Mobile Phone')},
-        }
+        self.columns = OrderedDict((
+            ("getFullname", {
+                "title": _("Full Name"),
+                "index": "getFullname",
+                "sortable": True, }),
+            ("Username", {
+                "title": _("User Name"), }),
+            ("getEmailAddress", {
+                "title": _("Email Address"), }),
+            ("getBusinessPhone", {
+                "title": _("Business Phone"), }),
+            ("getMobilePhone", {
+                "title": _("MobilePhone"), }),
+        ))
+
         self.review_states = [
             {'id': 'default',
              'title': _('Active'),
              'contentFilter': {'inactive_state': 'active'},
              'transitions': [{'id': 'deactivate'}, ],
-             'columns': ['getFullname',
-                         'Username',
-                         'getEmailAddress',
-                         'getBusinessPhone',
-                         'getMobilePhone']},
+             'columns': self.columns.keys()},
             {'id': 'inactive',
              'title': _('Dormant'),
              'contentFilter': {'inactive_state': 'inactive'},
              'transitions': [{'id': 'activate'}, ],
-             'columns': ['getFullname',
-                         'Username',
-                         'getEmailAddress',
-                         'getBusinessPhone',
-                         'getMobilePhone']},
+             'columns': self.columns.keys()},
             {'id': 'all',
              'title': _('All'),
              'contentFilter': {},
-             'columns': ['getFullname',
-                         'Username',
-                         'getEmailAddress',
-                         'getBusinessPhone',
-                         'getMobilePhone']},
+             'columns': self.columns.keys()},
         ]
 
     def folderitem(self, obj, item, index):
-        username = obj.getUsername()
-        item['getFullname'] = obj.getFullname()
-        item['getEmailAddress'] = obj.getEmailAddress()
+        url = item.get("url")
+        email = obj.getEmailAddress()
+        fullname = obj.getFullname()
+        item['getFullname'] = fullname
+        item['getEmailAddress'] = email
         item['getBusinessPhone'] = obj.getBusinessPhone()
         item['getMobilePhone'] = obj.getMobilePhone()
-        item['Username'] = username and username or ''
-        item['replace']['getFullname'] = \
-            "<a href='%s'>%s</a>" % (
-                item['url'], item['getFullname'])
-        if item['getEmailAddress']:
-            addr = item['getEmailAddress']
-            item['replace']['getEmailAddress'] = \
-                "<a href='mailto:%s'>%s</a>" % (addr, addr)
+        item['Username'] = obj.getUsername() or ""
+        item['replace']['getFullname'] = get_link(url, fullname)
+        if email:
+            item["replace"]['getEmailAddress'] = get_email_link(email)
         return item