django-cards 0.11.0__tar.gz → 0.11.2__tar.gz

{django-cards-0.11.0/django_cards.egg-info → django-cards-0.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-cards
-Version: 0.11.0
+Version: 0.11.2
 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.0 → django-cards-0.11.2}/cards/base.py

@@ -1,5 +1,6 @@
 import datetime
 import json
+from collections import defaultdict
 
 from ajax_helpers.utils import random_string
 from django.core.exceptions import FieldDoesNotExist
@@ -134,7 +135,7 @@ class CardBase:
 
     def add_boolean_entry(self, value, label=None, hidden=False, html_override=None,
                           entry_css_class=None, css_class=None,
-                          menu=None, default_if=None, value_type=None, **kwargs):
+                          menu=None, default_if=None, value_type=None, row_style=None, **kwargs):
         if value:
             entry = self._add_entry_internal(value='<i class="fas fa-check" style="color:green;"></i>',
                                              label=label,
@@ -145,6 +146,7 @@ class CardBase:
                                              menu=menu,
                                              default_if=default_if,
                                              value_type=value_type,
+                                             row_style=row_style,
                                              **kwargs)
         else:
             entry = self._add_entry_internal(value='<i class="fas fa-times" style="color:red;"></i>',
@@ -156,11 +158,13 @@ class CardBase:
                                              menu=menu,
                                              default_if=default_if,
                                              value_type=value_type,
+                                             row_style=row_style,
                                              **kwargs)
         return entry
 
     def add_date_entry(self, value, label=None, hidden=False, html_override=None,
-                       entry_css_class=None, css_class=None, menu=None, default_if=None, value_type=None, **kwargs):
+                       entry_css_class=None, css_class=None, menu=None, default_if=None,
+                       value_type=None, row_style=None, **kwargs):
         new_value = value.strftime('%d/%m/%y')
         return self._add_entry_internal(value=new_value,
                                         label=label,
@@ -171,6 +175,7 @@ class CardBase:
                                         menu=menu,
                                         default_if=default_if,
                                         value_type=value_type,
+                                        row_style=row_style,
                                         **kwargs)
 
     def add_row(self, *args, extra_row_kwargs=None):
@@ -284,7 +289,7 @@ class CardBase:
     def _add_many_to_many_field(self, label, query, query_filter=None, m2m_field=None,
                                 html_barge=None, default='N/A', html_override=None,
                                 entry_css_class=None, css_class=None, menu=None,
-                                default_if=None, value_type=None, **kwargs):
+                                default_if=None, value_type=None, row_style=None, **kwargs):
         if html_barge is None:
             html_barge = '<span class="small badge badge-pill badge-primary"> %1% </span> '
 
@@ -313,6 +318,7 @@ class CardBase:
                                         menu=menu,
                                         default_if=default_if,
                                         value_type=value_type,
+                                        row_style=row_style,
                                         **kwargs)
 
     def _add_entry_internal(self, value=None, field=None, label=None, default='N/A', link=None,
@@ -335,6 +341,7 @@ class CardBase:
                                           menu=menu,
                                           default_if=default_if,
                                           value_type=value_type,
+                                          row_style=row_style,
                                           **kwargs)
         elif isinstance(value, datetime.date):
             return self.add_date_entry(value=value,
@@ -344,6 +351,7 @@ class CardBase:
                                        menu=menu,
                                        default_if=default_if,
                                        value_type=value_type,
+                                       row_style=row_style,
                                        **kwargs)
         elif hasattr(value, 'through'):
             return self._add_many_to_many_field(label=label,
@@ -355,6 +363,7 @@ class CardBase:
                                                 menu=menu,
                                                 default_if=default_if,
                                                 value_type=value_type,
+                                                row_style=row_style,
                                                 **kwargs)
         else:
             if value is None or value == '' or default_if:
@@ -402,11 +411,11 @@ class CardBase:
 
                 value_dict = {'value': value,
                               'label': label,
-                              'menu': menu,
                               'link': link,
                               **kwargs}
-
-                row_style_html = html_row_style.format(**value_dict)
+                if menu is not None:
+                    value_dict['menu'] = menu.render()
+                row_style_html = html_row_style.format_map(defaultdict(lambda: '', value_dict))
 
             entry = {'label': label,
                      'html': value,

{django-cards-0.11.0 → django-cards-0.11.2/django_cards.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-cards
-Version: 0.11.0
+Version: 0.11.2
 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.0 → django-cards-0.11.2}/setup.py

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