django-cards 0.9.7__tar.gz → 0.10.0__tar.gz

{django-cards-0.9.7 → django-cards-0.10.0}/PKG-INFO

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

{django-cards-0.9.7 → django-cards-0.10.0}/cards/base.py

@@ -1,6 +1,7 @@
 import datetime
 import json
 
+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
@@ -74,7 +75,10 @@ class CardBase:
                  menu=None, tab_menu=None, template_name=None, call_details_data=False,
                  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', **kwargs):
+                 is_empty=False, empty_template_name=None, empty_message='N/A', collapsed=None, **kwargs):
+
+        if code is None:
+            code = random_string()
 
         self.code = code
         self.view = view
@@ -94,6 +98,8 @@ class CardBase:
             tab_menu = HtmlMenu(self.request, self.tab_menu_type).add_items(*tab_menu)
         self.tab_menu = tab_menu
         self.call_details_data = call_details_data
+        self.enable_collapse = collapsed is not None
+        self.collapsed = collapsed
 
         if is_empty:
             self.group_type = CARD_TYPE_STANDARD

{django-cards-0.9.7 → django-cards-0.10.0}/cards/card_list/base.py

@@ -1,4 +1,3 @@
-from ajax_helpers.utils import random_string
 from django.shortcuts import get_object_or_404
 from django.template.loader import render_to_string
 

{django-cards-0.9.7 → django-cards-0.10.0}/cards/standard.py

@@ -140,5 +140,3 @@ class CardMixin:
             getattr(self, field_setup_table_field)(table=table, details_object=self.cards[table_id].details_object)
         table.columns[kwargs['changed'][0]].alter_object(row_object, row_data[kwargs['changed'][0]])
         return table.refresh_row(self.request, kwargs['row_no'])
-
-

{django-cards-0.9.7 → django-cards-0.10.0}/cards/templates/cards/standard/datatable.html

@@ -12,10 +12,15 @@
             <div class="d-flex align-items-center">
                 <h5 class="mr-auto">{{ card.title }}</h5>
                 {{ card.menu.render }}
+                {% if card.enable_collapse %}
+            <div class="section-header-right {% if card.collapsed %} collapsed{% endif %}" data-target="#{{ card.code }}_body" data-toggle="collapse">
+                <i class="expandicon"></i>
+            </div>
+            {% endif %}
             </div>
         </div>
         {{ card.tab_menu.render }}
-        <div class="{{ card_body_css_class }}" id="{{ card.code }}_body"
+        <div class="{{ card_body_css_class }}{% if card.enable_collapse %} collapse{% if not card.collapsed %} show{% endif %}{% endif %}" id="{{ card.code }}_body"
              {% if card_body_css_style %}style="{{ card_body_css_style }}"{% endif %}>
             {% if show_search_bar and not show_pivot_table %}
                 <div class="d-flex">

{django-cards-0.9.7 → django-cards-0.10.0}/cards/templates/cards/standard/default.html

@@ -3,6 +3,11 @@
         <div class="d-flex align-items-center">
             <h5 class="mr-auto">{{ card.title }}</h5>
             {{ card.menu.render }}
+            {% if card.enable_collapse %}
+            <div class="section-header-right {% if card.collapsed %} collapsed{% endif %}" data-target="#{{ card.code }}_body" data-toggle="collapse">
+                <i class="expandicon"></i>
+            </div>
+            {% endif %}
         </div>
     </div>
     {% include 'cards/standard/default_body.html' %}

{django-cards-0.9.7 → django-cards-0.10.0}/cards/templates/cards/standard/default_body.html

@@ -1,6 +1,6 @@
 
 {{ card.tab_menu.render }}
-<div class="{{ card_body_css_class }}">
+<div class="{{ card_body_css_class }}{% if card.enable_collapse %} collapse{% if not card.collapsed %} show{% endif %}{% endif %}" id="{{ card.code }}_body">
     <div class="list-group">
         {% for row in card.rows %}
             {% if row.type == 'html' %}<div class="{{ item_css_class }}">{{ row.html|safe }}</div>{% else %}

{django-cards-0.9.7 → django-cards-0.10.0}/cards/templates/cards/standard/html.html

@@ -3,9 +3,14 @@
             <div class="d-flex align-items-center">
                 <h5 class="mr-auto">{{ card.title }}</h5>
                 {{ card.menu.render }}
+                {% if card.enable_collapse %}
+            <div class="section-header-right {% if card.collapsed %} collapsed{% endif %}" data-target="#{{ card.code }}_body" data-toggle="collapse">
+                <i class="expandicon"></i>
+            </div>
+            {% endif %}
             </div>
         </div>
-        <div class="{{ card_body_css_class }}" id="{{ card.code }}_body" {% if card_body_css_style %}style="{{ card_body_css_style }}"{% endif %}>
+        <div class="{{ card_body_css_class }}{% if card.enable_collapse %} collapse{% if not card.collapsed %} show{% endif %}{% endif %}" id="{{ card.code }}_body" {% if card_body_css_style %}style="{{ card_body_css_style }}"{% endif %}>
             {{ card.extra_card_info.html|safe }}
         </div>
         {% if card.footer %}

{django-cards-0.9.7 → django-cards-0.10.0}/cards/templates/cards/standard/list_selection.html

@@ -1,5 +1,9 @@
 <script>
+
+    var last_loaded_entry_id = null;
+
     function load_details(entry_id) {
+        last_loaded_entry_id = entry_id;
         $('.cards-list-group-item.active').removeClass('active');
         $('#list_' + entry_id).addClass('active');
         $(document).ready(function () {
@@ -12,6 +16,7 @@
     }
 
     function load_empty_details() {
+        last_loaded_entry_id = null;
         $('.cards-list-group-item.active').removeClass('active');
         $(document).ready(function () {
             {% if modal %}
@@ -25,6 +30,18 @@
     $(document).ready(function () {
          $( "#list_{{ selected_id }}" ).focus();
     });
+
+    ajax_helpers.command_functions.load_details = function (command) {
+        var entry_id = last_loaded_entry_id;
+        if (typeof command.entry_id !== "undefined") {
+            entry_id = command.entry_id;
+        }
+        if(entry_id == null) {
+            load_empty_details(entry_id);
+        } else {
+            load_details(entry_id);
+        }
+    }
 </script>
 <div class="{{ card_css_class }}" id="{{ card.code }}" data-title="">
     <div class="card-header">

{django-cards-0.9.7 → django-cards-0.10.0}/cards/templates/cards/standard/table.html

@@ -4,6 +4,11 @@
             <div class="d-flex align-items-center">
                 <h5 class="mr-auto">{{ card.title }}</h5>
                 {{ card.menu.render }}
+                {% if card.enable_collapse %}
+            <div class="section-header-right {% if card.collapsed %} collapsed{% endif %}" data-target="#{{ card.code }}_body" data-toggle="collapse">
+                <i class="expandicon"></i>
+            </div>
+            {% endif %}
             </div>
         </div>
 

{django-cards-0.9.7 → django-cards-0.10.0}/cards/templates/cards/standard/table_body.html

@@ -1,13 +1,13 @@
 {{ card.tab_menu.render }}
-<div class="{{ card_body_css_class }}">
+<div class="{{ card_body_css_class }}{% if card.enable_collapse %} collapse{% if not card.collapsed %} show{% endif %}{% endif %}" id="{{ card.code }}_body">
     <div class="list-group">
         <table class="{{ table_css_class }}">
             {% for row in card.rows %}
                 <tr>
                     {% if row.type == 'html' %}{% if not row.exclude_td %}<td class="{{ table_td_css_class }}"{% if row.colspan %} colspan="{{ row.colspan }}"{% endif %} {% if row.rowspan %} rowspan="{{ row.rowspan }}"{% endif %}>{{ row.html|safe }}</td>{% else %}{{ row.html|safe }}{% endif %}{% else %}
                     {% for entry in row.entries %}
-                        {% 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 %}
+                        {% if forloop.first %}{% if entry.label_td %}<td>{{ entry.label|safe }}</td>{% else %}<th class="{{ table_th_css_class }}">{{ entry.label|safe }}</th>{% endif %}{% endif %}
+                        {% if entry.value_th %}<th{% else %}<td class="{{ table_td_css_class }}"{% endif %}{% 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 %}
@@ -16,7 +16,7 @@
                             {% else %}
                                 {{ entry.html|safe }}
                             {% endif %}
-                            {% if entry.link %}</a>{% endif %}</td>
+                        {% if entry.link %}</a>{% endif %}{% if entry.value_th %}</th>{% else %}</td>{% endif %}
                     {% endfor %}{% endif %}</tr>
             {% endfor %}
         </table>

{django-cards-0.9.7 → django-cards-0.10.0}/django_cards.egg-info/PKG-INFO

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

{django-cards-0.9.7 → django-cards-0.10.0}/setup.py

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