Tweak some field renderers for sake of product view

tailbone/forms/renderers/__init__.py

@@ -41,7 +41,7 @@ from .employees import EmployeeFieldRenderer
 
 from .stores import StoreFieldRenderer
 from .vendors import VendorFieldRenderer, PurchaseFieldRenderer
-from .products import (GPCFieldRenderer, DepartmentFieldRenderer, BrandFieldRenderer,
-                       ProductFieldRenderer, PriceFieldRenderer, PriceWithExpirationFieldRenderer)
+from .products import (GPCFieldRenderer, DepartmentFieldRenderer, SubdepartmentFieldRenderer, CategoryFieldRenderer,
+                       BrandFieldRenderer, ProductFieldRenderer, PriceFieldRenderer, PriceWithExpirationFieldRenderer)
 
 from .batch import BatchIDFieldRenderer, HandheldBatchFieldRenderer

tailbone/forms/renderers/products.py

@@ -89,7 +89,7 @@ class DepartmentFieldRenderer(SelectFieldRenderer):
         if not department:
             return ''
         if department.number:
-            text = '{} {}'.format(department.number, department.name)
+            text = '({}) {}'.format(department.number, department.name)
         else:
             text = department.name
         return tags.link_to(text, self.request.route_url('departments.view', uuid=department.uuid))
@@ -97,24 +97,34 @@ class DepartmentFieldRenderer(SelectFieldRenderer):
 
 class SubdepartmentFieldRenderer(SelectFieldRenderer):
     """
-    Shows the subdepartment number as well as the name.
+    Shows a link to the subdepartment.
     """
+
     def render_readonly(self, **kwargs):
-        sub = self.raw_value
-        if sub:
-            return "{0} - {1}".format(sub.number, sub.name)
-        return ""
+        subdept = self.raw_value
+        if not subdept:
+            return ""
+        if subdept.number:
+            text = "({}) {}".format(subdept.number, subdept.name)
+        else:
+            text = subdept.name
+        return tags.link_to(text, self.request.route_url('subdepartments.view', uuid=subdept.uuid))
 
 
 class CategoryFieldRenderer(SelectFieldRenderer):
     """
-    Shows the category number as well as the name.
+    Shows a link to the category.
     """
+
     def render_readonly(self, **kwargs):
-        cat = self.raw_value
-        if cat:
-            return "{0} - {1}".format(cat.number, cat.name)
-        return ""
+        category = self.raw_value
+        if not category:
+            return ""
+        if category.code:
+            text = "({}) {}".format(category.code, category.name)
+        else:
+            text = category.name
+        return tags.link_to(text, self.request.route_url('categories.view', uuid=category.uuid))
 
 
 class BrandFieldRenderer(AutocompleteFieldRenderer):