djgentelella 0.3.18__py3-none-any.whl → 0.3.20__py3-none-any.whl

djgentelella/templates/forms/as_grid.html

@@ -0,0 +1,39 @@
+{% if errors %}
+<div class="alert alert-warning d-flex align-items-center" role="alert">
+	<svg class="bi flex-shrink-0 me-2" width="24" height="24" role="img" aria-label="Warning:">
+		<use xlink:href="#exclamation-triangle-fill"/>
+	</svg>
+	<div>
+		{{ errors }}
+		{% if not fields %}
+		{% for field in hidden_fields %}{{ field }}{% endfor %}
+		{% endif %}
+	</div>
+</div>
+
+{% endif %}
+{% for column in form.grid %}
+<div class="row">{% for row in column %}
+	<div class="col">{% for field in row %}
+		<div {% with classes=field.css_classes %}{% if classes %} class="{{ classes }}" {% else %} class="mb-3" {% endif %}
+							{% endwith %}>
+			{{ errors }}
+			{% if field.label %}{{ field.label_tag }}{% endif %}
+			{{ field }}
+			{% if field.help_text %}
+			<div class="feedback text-info" {% if field.auto_id %} id="{{ field.auto_id }}_helptext" {% endif %}>
+				{{ field.help_text|safe }}
+			</div>
+			{% endif %}
+		</div>
+		{% endfor %}
+	</div>
+	{% endfor %}
+	{% if forloop.last %}
+	{% for field in hidden_fields %}{{ field }}{% endfor %}
+	{% endif %}
+</div>{% endfor %}
+
+{% if not fields and not errors %}
+{% for field in hidden_fields %}{{ field }}{% endfor %}
+{% endif %}

djgentelella/templates/forms/as_horizontal.html

@@ -0,0 +1,36 @@
+{% if errors %}
+<div class="alert alert-warning d-flex align-items-center" role="alert">
+	<svg class="bi flex-shrink-0 me-2" width="24" height="24" role="img" aria-label="Warning:">
+		<use xlink:href="#exclamation-triangle-fill"/>
+	</svg>
+	<div>
+		{{ errors }}
+		{% if not fields %}
+		{% for field in hidden_fields %}{{ field }}{% endfor %}
+		{% endif %}
+	</div>
+</div>
+
+{% endif %}
+{% for field, errors in fields %}
+<div {% with classes=field.css_classes %}{% if classes %} class="{{ classes }}" {% else %}class="row form-group mb-3"
+					{% endif %}{% endwith %}>
+	{{ errors }}
+	{% if field.label %}<label for="{{ field.id_for_label }}" class="col-sm-2 col-form-label">{{ field.label }} </label>
+	{% endif %}
+	<div class="col-sm-10">
+		{{ field }}
+		{% if field.help_text %}
+		<div class="valid-feedback" {% if field.auto_id %} id="{{ field.auto_id }}_helptext" {% endif %}>
+			{{ field.help_text|safe }}
+		</div>
+		{% endif %}
+		{% if forloop.last %}
+		{% for field in hidden_fields %}{{ field }}{% endfor %}
+		{% endif %}
+	</div>
+</div>
+{% endfor %}
+{% if not fields and not errors %}
+{% for field in hidden_fields %}{{ field }}{% endfor %}
+{% endif %}

djgentelella/templates/forms/as_inline.html

@@ -0,0 +1,38 @@
+{% if errors %}
+<div class="alert alert-warning d-flex align-items-center" role="alert">
+	<svg class="bi flex-shrink-0 me-2" width="24" height="24" role="img" aria-label="Warning:">
+		<use xlink:href="#exclamation-triangle-fill"/>
+	</svg>
+	<div>
+		{{ errors }}
+		{% if not fields %}
+		{% for field in hidden_fields %}{{ field }}{% endfor %}
+		{% endif %}
+	</div>
+</div>
+
+{% endif %}
+<div class="row">
+	{% for field, errors in fields %}
+	<div {% with classes=field.css_classes %}{% if classes %} class="{{ classes }}" {% else %}class="col"
+						{% endif %}{% endwith %}>
+		{{ errors }}
+		{% if field.label %}{{ field.label_tag }}{% endif %}
+
+		{{ field }}
+		{% if field.help_text %}
+		{% if forloop.last %}
+		{% for field in hidden_fields %}{{ field }}{% endfor %}
+		{% endif %}
+
+		<div class="feedback text-info" {% if field.auto_id %} id="{{ field.auto_id }}_helptext" {% endif %}>
+			{{ field.help_text|safe }}
+		</div>
+		{% endif %}
+
+	</div>
+	{% endfor %}
+	{% if not fields and not errors %}
+	{% for field in hidden_fields %}{{ field }}{% endfor %}
+	{% endif %}
+</div>

djgentelella/templates/forms/as_plain.html

@@ -0,0 +1,33 @@
+{% if errors %}
+<div class="alert alert-warning d-flex align-items-center" role="alert">
+	<svg class="bi flex-shrink-0 me-2" width="24" height="24" role="img" aria-label="Warning:">
+		<use xlink:href="#exclamation-triangle-fill"/>
+	</svg>
+	<div>
+		{{ errors }}
+		{% if not fields %}
+		{% for field in hidden_fields %}{{ field }}{% endfor %}
+		{% endif %}
+	</div>
+</div>
+
+{% endif %}
+{% for field, errors in fields %}
+<div {% with classes=field.css_classes %}{% if classes %} class="{{ classes }}" {% else %}class="col-12"
+					{% endif %}{% endwith %}>
+	{{ errors }}
+	{% if field.label %}{{ field.label_tag }}{% endif %}
+	{{ field }}
+	{% if field.help_text %}
+	<div class="valid-feedback" {% if field.auto_id %} id="{{ field.auto_id }}_helptext" {% endif %}>
+		{{ field.help_text|safe }}
+	</div>
+	{% endif %}
+	{% if forloop.last %}
+	{% for field in hidden_fields %}{{ field }}{% endfor %}
+	{% endif %}
+</div>
+{% endfor %}
+{% if not fields and not errors %}
+{% for field in hidden_fields %}{{ field }}{% endfor %}
+{% endif %}

djgentelella/templates/gentelella/index.html

@@ -11,22 +11,22 @@
 {% endblock%}
 <div class="row">
 
-  <div class='col-sm-12 col-md-12 col-lg-12'>
-    <div class="card">
-      <div class="card-body">
-        <div class="card-title titles">
-          <h2> A form </h2>
-        </div>
-        <form action="" method="POST" enctype="multipart/form-data">
-          {% csrf_token %}
-          {{form.as_inline}}
-          <input class="btn btn-success" type="submit" value="Save"/>
-        </form>
+	<div class='col-sm-12 col-md-12 col-lg-12'>
+		<div class="card">
+			<div class="card-body">
+				<div class="card-title titles">
+					<h2> A form </h2>
+				</div>
+				<form action="" method="POST" enctype="multipart/form-data">
+					{% csrf_token %}
+					{{form}}
+					<input class="btn btn-success" type="submit" value="Save"/>
+				</form>
 
-      </div>
+			</div>
 
-    </div>
-  </div>
+		</div>
+	</div>
 </div>
 {% endblock %}
 {% block js %} {{ form.media }} {% endblock %}

djgentelella/templates/gentelella/widgets/chunkedupload.html

@@ -6,24 +6,19 @@
             <input class="chunkedupload-input" style="" type="{{ widget.type }}" data-inputtoken="{{ widget.name }}" data-process=".{{ widget.name }}_progress"  data-message=".{{ widget.name }}_messages"  name="{{ widget.name }}_widget" {% include "gentelella/widgets/attrs.html" %}>
         </div>
         <div   class="form-control {{ widget.name }}_messages" style="display:none;"></div>
-        <input type="hidden" name="{{ widget.name }}" value="" />
+        <input class="chunkedvalue" type="hidden" name="{{ widget.name }}" value='{{widget.value}}' autocomplete="off"/>
         <div class="input-group-text fileshow" ><i class="fa fa-eye"></i></div>
-        {% if widget.value %}
-        <div id="download_{{ widget.name }}" class="input-group-text bg-danger" >
-            <a href="{{widget.value.url}}" target="_blank"><i class="fa fa-download text-light"></i></a>
+        <div id="download_{{ widget.name }}" class="input-group-text bg-danger" {% if not widget.value %}style="display:none;"{% endif %} >
+            <a href="" target="_blank"><i class="fa fa-download text-light"></i></a>
         </div>
-        {% endif %}
     </div>
-
-    {% if widget.value and not widget.required %}
-    <div class="checkbox">
+    <div id="remove_{{ widget.name }}" class="checkbox">
         <label class="">
-            <div class="icheckbox_flat-green checked" style="position: relative;">
-                <input type="checkbox" autocomplete="off" data-widget="CheckboxInput"  class="flat"  style="position: absolute; opacity: 0;">
+            <div class="icheckbox_flat-green" style="position: relative;">
+                <input id="id_remove_{{ widget.name }}" type="checkbox" autocomplete="off" data-widget="CheckboxInput" name="remove_{{ widget.name }}_gt"  class="flat"  style="position: absolute; opacity: 0;">
                 <ins class="iCheck-helper"  ></ins></div>
-            {% trans 'Delete this file' %}
-
+            				{% trans 'Delete this file' %}
         </label>
     </div>
-    {% endif %}
-</div>
+
+</div>

djgentelella/templates/gentelella/widgets/file.html

@@ -7,24 +7,19 @@
     <input type="{{ widget.type }}" data-inputtoken="{{ widget.name }}" data-process=".{{ widget.name }}_progress"  data-message=".{{ widget.name }}_messages"  name="{{ widget.name }}_widget" {% include "gentelella/widgets/attrs.html" %}>
   </div>
   <div   class="form-control {{ widget.name }}_messages" style="display:none;"></div>
-  <input type="hidden" name="{{ widget.name }}" value="" />
+   <input type="hidden" name="{{ widget.name }}" value="{{ widget.value }}" />
    <div class="input-group-text fileshow" ><i class="fa fa-eye"></i></div>
-  {% if widget.value %}
   <div id="download_{{ widget.name }}" class="input-group-text bg-danger" >
-    <a href="{{widget.value.url}}" target="_blank"><i class="fa fa-download text-light"></i></a>
+    <a href="" target="_blank"><i class="fa fa-download text-light"></i></a>
   </div>
-  {% endif %}
 </div>
-
-{% if widget.value and not widget.required %}
-  <div class="checkbox">
+  <div id="check_{{ widget.name }}" class="checkbox">
     <label class="">
-      <div class="icheckbox_flat-green checked" style="position: relative;">
+      <div class="icheckbox_flat-green " style="position: relative;">
         <input type="checkbox" autocomplete="off" data-widget="CheckboxInput"  class="flat"  style="position: absolute; opacity: 0;">
         <ins class="iCheck-helper"  ></ins></div>
       {% trans 'Delete this file' %}
 
     </label>
   </div>
-{% endif %}
 </div>

djgentelella/tests/__init__.py

@@ -1,5 +1,6 @@
 from .Calendar_Test import *
+from .Notification_Test import *
 from .StoryLine_Test import *
 from .StoryMap_Test import *
 from .TimeLine_Test import *
-from .Notification_Test import *
+from .fields.files import *

djgentelella/tests/fields/files.py

@@ -0,0 +1,39 @@
+import base64
+
+from django.core.files.base import ContentFile
+from django.test import TestCase
+from rest_framework import serializers
+
+from djgentelella.fields.files import GTBase64FileField
+
+
+class GTBase64FileFieldTestCase(TestCase):
+    def test_to_internal_value_with_valid_data(self):
+        field = GTBase64FileField()
+        data = {
+            "name": "test.txt",
+            "value": base64.b64encode(b"Test content").decode("utf-8"),
+        }
+        expected_content = ContentFile(b"Test content")
+
+        result = field.to_internal_value(data)
+
+        self.assertEqual(result.read(), expected_content.read())
+        self.assertEqual(result.name, expected_content.name)
+
+    def test_to_internal_value_with_missing_fields(self):
+        field = GTBase64FileField()
+        data = {"name": "test.txt"}
+
+        with self.assertRaises(serializers.ValidationError):
+            field.to_internal_value(data)
+
+    def test_to_internal_value_with_invalid_base64(self):
+        field = GTBase64FileField()
+        data = {
+            "name": "test.txt",
+            "value": "invalid_base64",
+        }
+
+        with self.assertRaises(serializers.ValidationError):
+            field.to_internal_value(data)

djgentelella/views/select2autocomplete.py

@@ -71,14 +71,20 @@ class BaseSelect2View(generics.ListAPIView, viewsets.GenericViewSet):
     text_wrapper = ''
     order_by = 'pk'
 
+    def get_filter_suffix(self, fieldname):
+        if hasattr(self, f'get_filter_suffix_{fieldname}'):
+            return getattr(self, f'get_filter_suffix_{fieldname}')()
+        return '__icontains'
+
     def filter_data(self, queryset, qe):
         filters = None
         for field in self.fields:
+            suffix = self.get_filter_suffix(field)
             for q in qe:
                 if filters is None:
-                    filters = Q(**{field + '__icontains': q})
+                    filters = Q(**{field + suffix: q})
                 else:
-                    filters |= Q(**{field + '__icontains': q})
+                    filters |= Q(**{field + suffix: q})
         return queryset.filter(filters)
 
     def query_get(self, name, default, aslist=False):

djgentelella/widgets/core.py

@@ -18,6 +18,8 @@ from django.urls import reverse_lazy
 from django.utils import formats
 from django.utils.translation import gettext as _
 
+from djgentelella.models import ChunkedUpload
+
 
 def update_kwargs(attrs, widget, base_class='form-control '):
     if attrs is not None:
@@ -117,6 +119,21 @@ class NumberInput(Input):
         super().__init__(attrs, extraskwargs=extraskwargs)
 
 
+class FloatInput(Input):
+    input_type = 'number'
+    template_name = 'gentelella/widgets/number.html'
+
+    # min_value y max_value
+
+    def __init__(self, attrs=None, extraskwargs=True):
+        if extraskwargs:
+            attrs = update_kwargs(attrs, self.__class__.__name__)
+        if 'step' not in attrs:
+            attrs['step'] = "0.1"
+        attrs['inputmode'] = "decimal"
+        super().__init__(attrs, extraskwargs=extraskwargs)
+
+
 class EmailInput(Input):
     input_type = 'email'
     template_name = 'gentelella/widgets/email.html'
@@ -168,6 +185,22 @@ class FileInput(DJFileInput):
             attrs['data-done'] = reverse_lazy('upload_file_done')
         super().__init__(attrs)
 
+    def format_value(self, value):
+        """File input never renders a value."""
+        return
+
+    def value_from_datadict(self, data, files, name):
+        dev = None
+        token = data.get(name)
+        tmpupload = ChunkedUpload.objects.filter(upload_id=token).first()
+        if tmpupload:
+            dev = tmpupload.get_uploaded_file()
+            tmpupload.delete()
+        return dev
+
+    def value_omitted_from_data(self, data, files, name):
+        return name not in data
+
 
 class ImageRecordInput(DJFileInput):
     """

djgentelella/widgets/files.py

@@ -1,9 +1,16 @@
+import json
+from logging import getLogger
+from pathlib import Path
+
 from django.forms import FileInput
 from django.urls import reverse_lazy
+from django.utils.safestring import mark_safe
 
 from djgentelella.models import ChunkedUpload
 from djgentelella.widgets.core import update_kwargs
 
+logger = getLogger('djgentelella')
+
 
 class FileChunkedUpload(FileInput):
     input_type = 'file'
@@ -22,17 +29,39 @@ class FileChunkedUpload(FileInput):
 
     def format_value(self, value):
         """File input never renders a value."""
-        return value
+        if value:
+            name = Path(value.name).name
+            self.value = mark_safe(
+                '{"name": "%(name)s", "display_name": "%(display_name)s", "url": "%(url)s" }' % {
+                    'name': value.name,
+                    'display_name': name,
+                    'url': value.url})
+            return self.value
+        return ''
+
+    def parse_value(self, value):
+        dev = None
+        try:
+            dev = json.loads(value)
+            if not ('url' in dev or 'token' in dev or 'actions' in dev):
+                dev = None
+        except json.JSONDecodeError as e:
+            logger.warning("Json error parsing: " + repr(value))
+        return dev
 
     def value_from_datadict(self, data, files, name):
         dev = None
-        token = data.get(name)
-        if token == '0':
-            return False
-        tmpupload = ChunkedUpload.objects.filter(upload_id=token).first()
-        if tmpupload:
-            dev = tmpupload.get_uploaded_file()
-            tmpupload.delete()
+
+        token = self.parse_value(data.get(name))
+        if token:
+            if 'actions' in token and token['actions'] == 'delete':
+                return False
+            if 'token' in token:
+                tmpupload = ChunkedUpload.objects.filter(
+                    upload_id=token['token']).first()
+                if tmpupload:
+                    dev = tmpupload.get_uploaded_file()
+                    tmpupload.delete()
         return dev
 
     def value_omitted_from_data(self, data, files, name):

{djgentelella-0.3.18.dist-info → djgentelella-0.3.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: djgentelella
-Version: 0.3.18
+Version: 0.3.20
 Summary: Help building extra widgets for forms and speciall methods to render forms in templates
 Home-page: https://solvosoft.com
 Author: Luis Zarate Montero
@@ -376,39 +376,54 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 License-File: AUTHORS
-Requires-Dist: django-tree-queries (>=0.11.0)
-Requires-Dist: djangoajax (>=3.3)
-Requires-Dist: django-markitup (>=4.0.0)
+Requires-Dist: django-tree-queries >=0.11.0
+Requires-Dist: djangoajax >=3.3
+Requires-Dist: django-markitup >=4.0.0
 Requires-Dist: markdown
 Requires-Dist: Pillow
-Requires-Dist: djangorestframework (>=3.13)
-Requires-Dist: django (>=3.2)
-Requires-Dist: django-filter (>=22.1)
+Requires-Dist: djangorestframework >=3.13
+Requires-Dist: django >=3.2
+Requires-Dist: django-filter >=22.1
 Provides-Extra: dev
 Requires-Dist: pylp ; extra == 'dev'
 Requires-Dist: pylpconcat ; extra == 'dev'
 Requires-Dist: css-html-js-minify ; extra == 'dev'
 Provides-Extra: test
-Requires-Dist: selenium (==4.5.0) ; extra == 'test'
-Requires-Dist: selenium-screenshot (==2.0.0) ; extra == 'test'
+Requires-Dist: selenium ==4.5.0 ; extra == 'test'
+Requires-Dist: selenium-screenshot ==2.0.0 ; extra == 'test'
 
 Django Gentelella widgets
 ############################
 
+.. image:: https://img.shields.io/readthedocs/django-gentelella-widgets?label=Read%20the%20Docs&logo=read%20the%20docs&logoColor=white
+  :alt: Gentelella documentation
+
+.. image:: https://img.shields.io/pypi/pyversions/django
+  :alt: Gentelella supported python version
+
+.. image:: https://github.com/Solvosoft/django-gentelella-widgets/actions/workflows/django.yml/badge.svg
+  :alt: Gentelella test status
+
+
+
+This application is a set of utilities that will make developing applications with django and bootstrap 5 easier, as it provides a set of Javascript libraries such as select2, icheck, datatables and more nicely integrated as widgets or utilities that simplify application creation.
+
 This app helps you to integrate Django apps with `Gentelella <https://colorlib.com/polygon/gentelella/index.html>`_ building extra widgets for forms and speciall methods to render forms in templates.
 
-See `Documentation <https://django-gentelella-widgets.readthedocs.io/>`_
+.. image:: docs/source/_static/readme/logo.png
+  :width: 200
+  :alt: Gentelella Logo
 
-Installation
+Documentation
 ________________
 
-Installing from repository (Updated frequently, most of great functionalities are not in pip yet ).
+See `Documentation <https://django-gentelella-widgets.readthedocs.io/>`_
 
-.. code:: bash
+Installation
+________________
 
-   pip install git+https://github.com/luisza/django-gentelella-widgets.git#egg=djgentelella
+Installing from pypi
 
-An stable version on pip, but not all available widget are in this release (new release comming soon)
 
 .. code:: bash