django-cards 0.11.6__tar.gz → 0.11.8__tar.gz

{django-cards-0.11.6/django_cards.egg-info → django_cards-0.11.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-cards
-Version: 0.11.6
+Version: 0.11.8
 Summary: Django app that allows you make cards
 Home-page: https://github.com/django-advance-utils/django-cards
 Author: Thomas Turner

{django-cards-0.11.6 → django_cards-0.11.8}/cards/base.py

@@ -6,6 +6,7 @@ from ajax_helpers.utils import random_string
 from django.core.exceptions import FieldDoesNotExist
 from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe
+from django.utils.text import slugify
 from django_datatables.datatables import DatatableTable
 from django_datatables.plugins.reorder import Reorder
 from django_datatables.reorder_datatable import OrderedDatatable
@@ -83,10 +84,13 @@ class CardBase:
                  group_type=CARD_TYPE_STANDARD, show_created_modified_dates=False,
                  footer=None, extra_card_context=None,
                  is_empty=False, empty_template_name=None, empty_message='N/A',
-                 collapsed=None, hidden_if_blank_or_none=None, **kwargs):
+                 collapsed=None, hidden_if_blank_or_none=None, hidden_if_zero=None, **kwargs):
 
         if code is None:
-            code = random_string()
+            if title is not None:
+                code = slugify(title).replace('-', '_') + '_card'
+            else:
+                code = random_string()
 
         self.code = code
         self.view = view
@@ -114,6 +118,7 @@ class CardBase:
         self.enable_collapse = collapsed is not None
         self.collapsed = collapsed
         self.hidden_if_blank_or_none = hidden_if_blank_or_none
+        self.hidden_if_zero = hidden_if_zero
 
         if is_empty:
             self.group_type = CARD_TYPE_STANDARD
@@ -133,7 +138,7 @@ class CardBase:
         self.child_card_groups = []
 
     # noinspection PyMethodMayBeStatic
-    def add_extra_card_info(self, extra_info, group_type,  **kwargs):
+    def add_extra_card_info(self, extra_info, group_type, **kwargs):
         if group_type in (CARD_TYPE_DATATABLE, CARD_TYPE_ORDERED_DATATABLE):
             extra_info['datatable_id'] = kwargs.get('datatable_id', self.code)
             extra_info['datatable'] = kwargs.get('datatable')
@@ -216,7 +221,7 @@ class CardBase:
             self.rows.append(row)
 
     def add_entry(self, value=None, field=None, label=None, entry_css_class=None, css_class=None,
-                  default='N/A', link=None,  hidden=False, hidden_if_blank_or_none=None,
+                  default='N/A', link=None, hidden=False, hidden_if_blank_or_none=None, hidden_if_zero=None,
                   html_override=None, value_method=None, value_type=None, default_if=None, row_style=None, **kwargs):
 
         entry = self._add_entry_internal(value=value,
@@ -228,6 +233,7 @@ class CardBase:
                                          link=link,
                                          hidden=hidden,
                                          hidden_if_blank_or_none=hidden_if_blank_or_none,
+                                         hidden_if_zero=hidden_if_zero,
                                          html_override=html_override,
                                          value_method=value_method,
                                          value_type=value_type,
@@ -319,7 +325,7 @@ class CardBase:
                     if callable(value):
                         value = value()
                     html += html_barge.replace('%1%', str(value))
-                
+
         return self._add_entry_internal(label=label,
                                         value=html,
                                         default=default,
@@ -333,7 +339,7 @@ class CardBase:
                                         **kwargs)
 
     def _add_entry_internal(self, value=None, field=None, label=None, default='N/A', link=None,
-                            hidden=False, hidden_if_blank_or_none=None, html_override=None,
+                            hidden=False, hidden_if_blank_or_none=None, hidden_if_zero=None, html_override=None,
                             value_method=None, value_type=None,
                             entry_css_class=None, css_class=None, menu=None, default_if=None, row_style=None,
                             **kwargs):
@@ -343,7 +349,11 @@ class CardBase:
         if hidden_if_blank_or_none is None:
             hidden_if_blank_or_none = self.hidden_if_blank_or_none
 
-        if hidden or (hidden_if_blank_or_none and (value is None or value == '')):
+        if hidden_if_zero is None:
+            hidden_if_zero = self.hidden_if_zero
+
+        if hidden or (hidden_if_blank_or_none and (value is None or value == '') or
+                      (hidden_if_zero and isinstance(value, (float, int)) and value == 0)):
             return None
         if isinstance(value, bool):
             return self.add_boolean_entry(value=value,

{django-cards-0.11.6 → django_cards-0.11.8/django_cards.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-cards
-Version: 0.11.6
+Version: 0.11.8
 Summary: Django app that allows you make cards
 Home-page: https://github.com/django-advance-utils/django-cards
 Author: Thomas Turner

{django-cards-0.11.6 → django_cards-0.11.8}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="django-cards",
-    version="0.11.6",
+    version="0.11.8",
     author="Thomas Turner",
     description="Django app that allows you make cards",
     long_description=long_description,