django-cards 0.8.6__tar.gz → 0.8.8__tar.gz

{django-cards-0.8.6/django_cards.egg-info → django-cards-0.8.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-cards
-Version: 0.8.6
+Version: 0.8.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.8.6 → django-cards-0.8.8}/cards/base.py

@@ -124,7 +124,7 @@ class CardBase:
             extra_info['html'] = kwargs.get('html')
 
     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):
+                          entry_css_class=None, css_class=None, menu=None, default_if=None, **kwargs):
         if value:
             entry = self._add_entry_internal(value='<i class="fas fa-check" style="color:green;"></i>',
                                              label=label,
@@ -133,7 +133,8 @@ class CardBase:
                                              entry_css_class=entry_css_class,
                                              css_class=css_class,
                                              menu=menu,
-                                             default_if=default_if)
+                                             default_if=default_if,
+                                             **kwargs)
         else:
             entry = self._add_entry_internal(value='<i class="fas fa-times" style="color:red;"></i>',
                                              label=label,
@@ -142,11 +143,12 @@ class CardBase:
                                              entry_css_class=entry_css_class,
                                              css_class=css_class,
                                              menu=menu,
-                                             default_if=default_if)
+                                             default_if=default_if,
+                                             **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):
+                       entry_css_class=None, css_class=None, menu=None, default_if=None, **kwargs):
         new_value = value.strftime('%d/%m/%y')
         return self._add_entry_internal(value=new_value,
                                         label=label,
@@ -155,15 +157,18 @@ class CardBase:
                                         entry_css_class=entry_css_class,
                                         css_class=css_class,
                                         menu=menu,
-                                        default_if=default_if)
+                                        default_if=default_if,
+                                        **kwargs)
 
-    def add_row(self, *args):
+    def add_row(self, *args, extra_row_kwargs=None):
+        if extra_row_kwargs is None:
+            extra_row_kwargs = {}
         entries = []
         for arg in args:
             if isinstance(arg, str):
-                entry = self._add_entry_internal(field=arg)
+                entry = self._add_entry_internal(field=arg, **extra_row_kwargs)
             else:
-                entry = self._add_entry_internal(**arg)
+                entry = self._add_entry_internal(**arg, **extra_row_kwargs)
             if entry is not None:
                 entries.append(entry)
 
@@ -246,7 +251,7 @@ class CardBase:
 
     def _add_many_to_many_field(self, label, query, query_filter, m2m_field,
                                 html_barge, default='N/A', html_override=None,
-                                entry_css_class=None, css_class=None, menu=None, default_if=None):
+                                entry_css_class=None, css_class=None, menu=None, default_if=None, **kwargs):
         if html_barge is None:
             html_barge = '<span class="small badge badge-pill badge-primary"> %1% </span> '
 
@@ -273,7 +278,8 @@ class CardBase:
                                         entry_css_class=entry_css_class,
                                         css_class=css_class,
                                         menu=menu,
-                                        default_if=default_if)
+                                        default_if=default_if,
+                                        **kwargs)
 
     def _add_entry_internal(self, value=None, field=None, label=None, default='N/A', link=None,
                             hidden=False, hidden_if_blank_or_none=False, html_override=None,
@@ -293,14 +299,16 @@ class CardBase:
                                           entry_css_class=entry_css_class,
                                           css_class=entry_css_class,
                                           menu=menu,
-                                          default_if=default_if)
+                                          default_if=default_if,
+                                          **kwargs)
         elif isinstance(value, datetime.date):
             return self.add_date_entry(value=value,
                                        label=label,
                                        hidden=hidden,
                                        html_override=html_override,
                                        menu=menu,
-                                       default_if=default_if)
+                                       default_if=default_if,
+                                       **kwargs)
         elif hasattr(value, 'through'):
             return self._add_many_to_many_field(label=label,
                                                 query=value,
@@ -312,7 +320,8 @@ class CardBase:
                                                 entry_css_class=entry_css_class,
                                                 css_class=entry_css_class,
                                                 menu=menu,
-                                                default_if=default_if)
+                                                default_if=default_if,
+                                                **kwargs)
         else:
             if value is None or value == '' or default_if:
                 value = default
@@ -332,7 +341,8 @@ class CardBase:
                         value = [self.get_value_from_type(v, value_type, ft, is_default, **kwargs)
                                  for v, ft in zip(value, field_type)]
                     else:
-                        value = [self.get_value_from_type(v, value_type, field_type, is_default, **kwargs) for v in value]
+                        value = [self.get_value_from_type(v, value_type, field_type,
+                                                          is_default, **kwargs) for v in value]
                 else:
                     value = self.get_value_from_type(value, value_type, field_type, is_default, **kwargs)
             if html_override is not None:
@@ -355,7 +365,8 @@ class CardBase:
                      'css_class': css_class,
                      'multiple_lines': multiple_parts,
                      'link': link,
-                     'menu': menu}
+                     'menu': menu,
+                     **kwargs}
             return entry
 
     def get_value_from_type(self, value, value_type, field_type, is_default, **kwargs):
@@ -443,16 +454,18 @@ class CardBase:
                     title += letter
                 return title
 
-    def add_rows(self, *args, default='N/A', hidden=False):
+    def add_rows(self, *args, default='N/A', hidden=False, extra_row_kwargs=None):
+        if extra_row_kwargs is None:
+            extra_row_kwargs = {}
         for arg in args:
             if isinstance(arg, str):
-                self.add_entry(field=arg, default=default, hidden=hidden)
+                self.add_entry(field=arg, default=default, hidden=hidden, **extra_row_kwargs)
             elif isinstance(arg, dict):
                 if 'default' not in arg:
                     arg['default'] = default
                 if 'hidden' not in arg:
                     arg['hidden'] = hidden
-                self.add_entry(**arg)
+                self.add_entry(**arg, **extra_row_kwargs)
             elif isinstance(arg, (list, tuple)):
                 self.add_row(*arg)
 

{django-cards-0.8.6 → django-cards-0.8.8}/cards/standard.py

@@ -50,7 +50,6 @@ class CardMixin:
             else:
                 cards.append(card)
 
-
         if group_code not in self.card_groups:
             self.card_groups[group_code] = []
 

{django-cards-0.8.6 → django-cards-0.8.8}/cards/templates/cards/standard/table_body.html

@@ -5,8 +5,8 @@
             {% for row in card.rows %}
                 <tr>
                     {% for entry in row.entries %}
-                        <th class="{{ table_th_css_class }}">{{ entry.label|safe }}</th>
-                        <td class="{{ table_td_css_class }}">{% if entry.link %}
+                        {% if forloop.first %}<th class="{{ table_th_css_class }}">{{ entry.label|safe }}</th>{% endif %}
+                        <td class="{{ table_td_css_class }}"{% if entry.colspan %} colspan="{{ entry.colspan }}"{% endif %}{% if entry.rowspan %} rowspan="{{ entry.rowspan }}"{% endif %}>{% if entry.link %}
                             <a class="list-group-item cards-list-group-item" href="{{ entry.link }}">{% endif %}
                             {% if entry.multiple_lines %}
                                 {% for x in entry.html %}
@@ -15,8 +15,8 @@
                             {% else %}
                                 {{ entry.html|safe }}
                             {% endif %}
-                            {% if entry.link %}</a>{% endif %}</td></tr>
-                    {% endfor %}
+                            {% if entry.link %}</a>{% endif %}</td>
+                    {% endfor %}</tr>
             {% endfor %}
         </table>
     </div>

{django-cards-0.8.6 → django-cards-0.8.8/django_cards.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-cards
-Version: 0.8.6
+Version: 0.8.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.8.6 → django-cards-0.8.8}/setup.py

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