djgentelella 0.4.4__py3-none-any.whl → 0.4.6__py3-none-any.whl

djgentelella/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.4.4'
+__version__ = '0.4.6'
 
 if __name__ == '__main__':
     print(__version__)

djgentelella/firmador_digital/forms.py

@@ -4,6 +4,8 @@ from django import forms
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
 
+from djgentelella.firmador_digital.models import UserSignatureConfig, \
+    get_signature_default, FORMATS_DATE, FONT_ALIGNMENT, FONT_CHOICES
 from djgentelella.firmador_digital.signvalue_utils import ValueDSParser
 from djgentelella.forms.forms import GTForm
 from djgentelella.widgets import core as genwidgets
@@ -26,3 +28,111 @@ class RenderValueForm(GTForm, ValueDSParser):
                 _("Invalid value not encoded as b64 o json parser error"),
                 code="invalid")
         return jsondata
+
+
+class SignatureConfigForm(GTForm, forms.ModelForm):
+    backgroundColor = forms.CharField(
+        max_length=50,
+        widget=genwidgets.ColorInput,
+        required=True,
+        label=_("Background color")
+    )
+    contact = forms.CharField(
+        required=False,
+        max_length=100,
+        widget=genwidgets.TextInput,
+        label=_("Contact")
+    )
+    dateFormat = forms.ChoiceField(
+        widget=genwidgets.Select,
+        required=True,
+        choices=FORMATS_DATE,
+        label=_("Date format")
+    )
+
+    defaultSignMessage = forms.CharField(
+        widget=genwidgets.Textarea,
+        required=False,
+        max_length=100,
+        label=_("Signature message")
+    )
+    # font = forms.ChoiceField(
+    #     required=True,
+    #     widget=genwidgets.Select,
+    #     label=_("Font"),
+    #     choices=FONT_CHOICES
+    # )
+    fontAlignment = forms.ChoiceField(
+        choices=FONT_ALIGNMENT,
+        widget=genwidgets.Select,
+        required=True,
+        label=_("Font alignment")
+    )
+    fontColor = forms.CharField(
+        max_length=50,
+        widget=genwidgets.ColorInput,
+        required=True,
+        label=_("Font color"),
+    )
+    fontSize = forms.IntegerField(
+        min_value=5,
+        max_value=28,
+        initial=7,
+        widget=genwidgets.NumberInput,
+        label=_("Font size")
+    )
+    place = forms.CharField(
+        required=False,
+        max_length=100,
+        widget=genwidgets.TextInput,
+        label=_("Place")
+    )
+    reason = forms.CharField(
+        required=False,
+        max_length=100,
+        widget=genwidgets.TextInput,
+        label=_("Reason")
+    )
+    isVisibleSignature = forms.BooleanField(
+        required=False,
+        widget=genwidgets.YesNoInput,
+        label=_("Visible signature")
+    )
+
+    default_render_type = "as_grid"
+
+    grid_representation = [
+        [["contact"]],
+        [["place"]],
+        [["reason"]],
+        # [["dateFormat"], ["font"]],
+        [["dateFormat"], ["isVisibleSignature"]],
+        [["fontSize"], ["fontColor"], ["backgroundColor"], ["fontAlignment"]],
+        # [["isVisibleSignature"]],
+        [["defaultSignMessage"]],
+    ]
+
+    class Meta:
+        model = UserSignatureConfig
+        fields = []
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        cfg = self.instance.config if getattr(self.instance, "config",
+                                              None) else get_signature_default()
+        for key, value in cfg.items():
+            if key in self.fields:
+                self.fields[key].initial = value
+
+    def save(self, commit=True):
+        data = get_signature_default()
+        for key in data.keys():
+            if key in self.cleaned_data:
+                val = self.cleaned_data[key]
+
+                if isinstance(data[key], str) and not isinstance(val, str):
+                    val = str(val)
+                data[key] = val
+        self.instance.config = data
+        return super().save(commit=commit)

djgentelella/firmador_digital/models.py

@@ -1,6 +1,27 @@
+from django.utils.translation import gettext_lazy as _
 from django.contrib.auth import get_user_model
 from django.db import models
 
+FORMATS_DATE = [
+    ("dd/MM/yyyy hh:mm:ss a", "dd/MM/yyyy hh:mm:ss a"),
+    ("yyyy/MM/dd HH:mm:ss",   "yyyy/MM/dd HH:mm:ss"),
+    ("MM/dd/yyyy hh:mm:ss a", "MM/dd/yyyy hh:mm:ss a"),
+    ("dd-MM-yyyy",            "dd-MM-yyyy"),
+]
+
+FONT_ALIGNMENT = [
+    ("LEFT", _("LEFT")),
+    ("CENTER", _("CENTER")),
+    ("RIGHT", _("RIGHT")),
+]
+
+FONT_CHOICES = [
+    ("Nimbus Sans Regular", "Nimbus Sans Regular"),
+    ("Nimbus Sans Bold", "Nimbus Sans Bold"),
+    ("Nimbus Sans Italic", "Nimbus Sans Italic"),
+    ("Nimbus Sans Bold Italic", "Nimbus Sans Bold Italic"),
+]
+
 def get_signature_default():
     return {
         "backgroundColor": "transparente",

djgentelella/firmador_digital/views.py

@@ -0,0 +1,31 @@
+from django.contrib import messages
+from django.contrib.auth.decorators import login_required
+from django.shortcuts import render, get_object_or_404, redirect
+from django.utils.translation import gettext_lazy as _
+
+from djgentelella.firmador_digital.forms import SignatureConfigForm
+from djgentelella.firmador_digital.models import UserSignatureConfig
+
+@login_required
+def update_signature_settings(request):
+
+    config, is_created = UserSignatureConfig.objects.get_or_create(user=request.user)
+
+
+    if request.method == "POST":
+        form = SignatureConfigForm(request.POST, instance=config, render_type="as_grid")
+        if form.is_valid():
+            form.save()
+            messages.success(request, _("Updated signature settings successfully."))
+            return redirect("signature_config")
+    else:
+        form = SignatureConfigForm(instance=config, render_type="as_grid")
+
+
+    return render(
+        request,
+        "gentelella/digital_signature/update_signature_settings.html",
+        context={
+            "form": form
+        }
+    )

djgentelella/groute.py

@@ -18,7 +18,10 @@ def register_lookups(prefix='', basename=None):
     def decore(klass):
         if basename in ['userbase', 'groupbase']:
             from djgentelella import settings
-            if settings.REGISTER_DEFAULT_USER_API:
+            if klass.__module__ == 'djgentelella.gtselects':
+                if settings.REGISTER_DEFAULT_USER_API:
+                    routes.register(prefix, klass, basename=basename)
+            else:
                 routes.register(prefix, klass, basename=basename)
         else:
             routes.register(prefix, klass, basename=basename)

djgentelella/locale/es/LC_MESSAGES/django.po

@@ -616,3 +616,51 @@ msgstr "Iniciar"
 
 msgid "Unknown"
 msgstr "Desconocido"
+
+msgid "LEFT"
+msgstr "IZQUIERDA"
+
+msgid "CENTER"
+msgstr "CENTRO"
+
+msgid "RIGHT"
+msgstr "DERECHA"
+
+msgid "Signature settings"
+msgstr "Configuración de firma"
+
+msgid "Updated signature settings successfully."
+msgstr "Configuración de firma actualizada correctamente."
+
+msgid "Background color"
+msgstr "Color de fondo"
+
+msgid "Contact"
+msgstr "Contacto"
+
+msgid "Date format"
+msgstr "Formato de fecha"
+
+msgid "Signature message"
+msgstr "Mensaje de firma"
+
+msgid "Font"
+msgstr "Fuente"
+
+msgid "Font alignment"
+msgstr "Alineación de fuente"
+
+msgid "Font color"
+msgstr "Color de fuente"
+
+msgid "Font size"
+msgstr "Tamaño de fuente"
+
+msgid "Place"
+msgstr "Lugar"
+
+msgid "Reason"
+msgstr "Razón"
+
+msgid "Visible signature"
+msgstr "Firma visible"

djgentelella/templates/gentelella/digital_signature/update_signature_settings.html

@@ -0,0 +1,57 @@
+{% extends 'gentelella/base.html' %}
+{% load i18n %}
+
+{% block title %} {% trans 'Signature settings' %} {% endblock %}
+
+{% block pre_head %}
+{% endblock %}
+
+{% block content %}
+	<div class="card mt-2">
+		<div class="card-body">
+
+			<div class="card-title titles">
+				<h1 class="text-center">
+					{% trans 'Signature settings' %}
+				</h1>
+			</div>
+
+			<div class="row justify-content-center my-4">
+				<div class="col-lg-6 col-md-10 col-12">
+
+					<form action="" id="form_signature" method="POST">
+						{% csrf_token %}
+						{{ form.as_grid }}
+
+						<div class="text-center">
+							<button type="submit" name="action" value="update" class="btn btn-success btn-sm">
+								{% trans 'Save' %}
+								<i class="fa fa-floppy-o" aria-hidden="true"></i>
+							</button>
+						</div>
+
+					</form>
+
+				</div>
+			</div>
+
+		</div>
+	</div>
+{% endblock %}
+
+{% block js %}
+	<script>
+
+		// auto remove messages
+		document.addEventListener("DOMContentLoaded", function () {
+			setTimeout(function () {
+				document.querySelectorAll(".alert-success").forEach(function (message) {
+					message.style.transition = "opacity 0.5s";
+					message.style.opacity = "0";
+					setTimeout(() => message.remove(), 500);
+				});
+			}, 1500);
+		});
+
+	</script>
+{% endblock %}

djgentelella/urls.py

@@ -13,6 +13,7 @@ from djgentelella.notification.base import NotificacionAPIView, NotificationView
 from djgentelella.permission_management import views as permissions
 from djgentelella.widgets.helper import HelperWidgetView
 from djgentelella.wysiwyg import views as wysiwyg
+from djgentelella.firmador_digital import views as firmador_digital
 from .groute import routes
 from .templatetags.gtsettings import get_version
 from .views import auth
@@ -88,6 +89,7 @@ base_urlpatterns = [
     re_path('^notification/list/$', notification_list_view,
             name="notification_list"),
     path('tableapi/', include(router.urls)),
+    path("update_config/", firmador_digital.update_signature_settings, name="signature_config"),
 ]
 
 permission_management_urls = [

{djgentelella-0.4.4.dist-info → djgentelella-0.4.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: djgentelella
-Version: 0.4.4
+Version: 0.4.6
 Summary: Help building extra widgets for forms and speciall methods to render forms in templates
 Author-email: Solvosoft <info@solvosoft.com>
 Maintainer-email: Luis Zarate Montero <luis.zarate@solvosoft.com>

{djgentelella-0.4.4.dist-info → djgentelella-0.4.6.dist-info}/RECORD

@@ -1,15 +1,15 @@
-djgentelella/__init__.py,sha256=SZ45PeABDxCAv7VZI4emwNNgGIkc2K-9QlgBEXYY9m0,73
+djgentelella/__init__.py,sha256=1XSKCxRWCYAlvKy0ZadvDp5Sq250jvxn79PQCZSQvvM,73
 djgentelella/admin.py,sha256=hFPWtRyTZWYtuKEv-SZ3r6lHw3aissX0ObqxYmxblY0,1531
 djgentelella/apps.py,sha256=5VEbpUv4b1Jh7gCRAQCe5TvpakRyndKwafjVj0z-Xfo,153
 djgentelella/chartjs.py,sha256=iNYoFnaIQoXsYInJFbSE2quWpjmDz5CuMKpVsvt4pRM,8572
 djgentelella/elements.py,sha256=tMGzA1pE_PytYgAMJutuaYGsnk4k8y7-Kg_D6F5rV6o,3340
 djgentelella/exceptions.py,sha256=x321e40KAjqS5cDv7lIc1TEoSYwTw-pHm7eZV_o0xBI,262
-djgentelella/groute.py,sha256=EMJhNK9uEziyf4Gz0Q4hoiYCUqVe4PhYOkiNSuqAaq8,646
+djgentelella/groute.py,sha256=FPKKZBfm0UYAfMKmeLGhPBWqPXqazADjt7iKMruVmcE,799
 djgentelella/gtselects.py,sha256=f8tBg68KQoYYCW1YNZt8PiKmdjItJY2kwN23ScO6nqM,590
 djgentelella/models.py,sha256=PZGQiIGdDxhkdXAPIXb2tgyDvnnyK6e0ePjRBRJ6Bg4,4560
 djgentelella/objectmanagement.py,sha256=y_dkSKIOfKKK9t1hZ8mwcM5RNxj0bChpKYvUn50mVzs,3121
 djgentelella/settings.py,sha256=kOuXF0T9ZIg_NqIStkiKdM-QOLrRjjfHP-AVXvSGRAM,3205
-djgentelella/urls.py,sha256=tmTYPnNcJkcNlAhe2mp-BcSGsRmvEJuTFFZ7a2rSp9Q,4864
+djgentelella/urls.py,sha256=rbc8w4gEDZ5ahdGLhOKpYIFp7BRy2EwcPhJIownuFdc,5029
 djgentelella/utils.py,sha256=Bh_-KBrrLRAK_b_CkyYm0Y0HdKyJAp2vNIwESYd3PcA,825
 djgentelella/blog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 djgentelella/blog/admin.py,sha256=ImQU7Q0SJNTigjgz1o6mizJwFEepZle5JSCBJXheLMw,29
@@ -55,10 +55,11 @@ djgentelella/fields/drfdatetime.py,sha256=CpN5wT-NmaG8q8cKjwEuylhnlNHRqx-aIwdWqH
 djgentelella/fields/files.py,sha256=pezlWl7WYtSFE0DSBcOeVf4zZo9MUkm_TxQZYYN6TZ4,5538
 djgentelella/fields/tree.py,sha256=I_XxsnxXuXiJbeQSEEyni_AzoiYkNJuPE7LBO6mqrXs,2209
 djgentelella/firmador_digital/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-djgentelella/firmador_digital/forms.py,sha256=NGcpQOI1eUq3An5aYLI2eFjXH28nuaqMYbSyhD6tPhk,868
-djgentelella/firmador_digital/models.py,sha256=i6odjdzP3hvAi31gIKJq6sqYkcCWf_78igEAk4_6mw4,1035
+djgentelella/firmador_digital/forms.py,sha256=sXDHEza76gNwnmwlbuQmf87vFFmIV8jOGSWC0P8QbJs,4024
+djgentelella/firmador_digital/models.py,sha256=MeuVxToDTWQugnCqLL1Zp1Us1y8GlyZW0Sd5XWwCaw4,1652
 djgentelella/firmador_digital/signvalue_utils.py,sha256=Nh8v8AkmAjWXOP9hcc9pVNhzJZpTnHwJ1a9dnWqTWTo,1320
 djgentelella/firmador_digital/utils.py,sha256=jlJorQh8cC8iJCe5gXS3d-mR_GK8_XjaKEq4GeZ5Zbc,5354
+djgentelella/firmador_digital/views.py,sha256=Q7qQnznedQ55cG2MtE4exztF6vFT3o6HfppZlAUaLek,1058
 djgentelella/firmador_digital/viewsets.py,sha256=caxoifIMe1UHh61wmHjpRoBcyga08B8uViQgGZIVYsY,3274
 djgentelella/firmador_digital/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 djgentelella/firmador_digital/config/asgi_config.py,sha256=mGWMKpdgoqL28MTwuQTEHtf3JJYxah3-Uguddd9p3DM,1071
@@ -73,8 +74,8 @@ djgentelella/forms/__init__.py,sha256=tsFtaTeLH5pOQrgAVd4xjU6w3rPskn15b9kiW9GZuH
 djgentelella/forms/decorators.py,sha256=MpXYM2P4lgLLoNhTVwphYHPENIipKk-qEP9MmEa-nrY,2328
 djgentelella/forms/forms.py,sha256=wFpNJT8GAhYDfjGZ_f_IrHRIAC9Ly1_VznDQCoDgUAg,7718
 djgentelella/forms/models.py,sha256=eZNVwPVytY0vVXUgmVWiZfZsXctFy62O1JsYyxqL4v0,389
-djgentelella/locale/es/LC_MESSAGES/django.mo,sha256=nhgNgd7-UdcF8svqO1zmH7w9PUrnVkDyOBkkTdgllrk,13845
-djgentelella/locale/es/LC_MESSAGES/django.po,sha256=el-Vh6DRjx8n0JPQe3FvvfvFiqaRdzJ23RRqKAezBNM,13705
+djgentelella/locale/es/LC_MESSAGES/django.mo,sha256=8CfwOhzXiQDeg0P8Buulhpf9xgMmHAc66Jfy0trjJ1M,14626
+djgentelella/locale/es/LC_MESSAGES/django.po,sha256=Rq92B5KgyWuWlLtm-IOoUong5TYk4Pfb5Sr51Z-sgBc,14446
 djgentelella/locale/es/LC_MESSAGES/djangojs.mo,sha256=g0X3s9MJspT8HmHXz6ZS34dUwELqGy9lZ3VJPedDEq8,5113
 djgentelella/locale/es/LC_MESSAGES/djangojs.po,sha256=SGBjuy44s0bfqWkXI3ua1v_hBHe-89kdBXT_A3vH7iE,5292
 djgentelella/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -885,6 +886,7 @@ djgentelella/templates/gentelella/cruds/list.html,sha256=1FjqKMaOUZcnViXWMsKnAdh
 djgentelella/templates/gentelella/cruds/update.html,sha256=NvZwBrNlOMRDtdTTRP5TR1aIH6KRrcGTQ-4Di5dPfOM,3862
 djgentelella/templates/gentelella/cruds/pagination/enumeration.html,sha256=cOHleHuHqm8j3W7ZwFX5Hi9Q_pyY9yRD_3_7702_3Hw,337
 djgentelella/templates/gentelella/cruds/pagination/prev_next.html,sha256=1R0ww5emRFF3_qi-xJpCOmuXMdbcdw8xX4I68qX5h8M,731
+djgentelella/templates/gentelella/digital_signature/update_signature_settings.html,sha256=E7Ast9y-7rbDFA2tn3pt_KmaSMmZm1yjxPM5tz2mHFA,1260
 djgentelella/templates/gentelella/email/base.html,sha256=05y5UHVuo7jcqUe8edyNa5mnshVZfvcnw554DJLXouc,55
 djgentelella/templates/gentelella/email/notification.html,sha256=PH823Y0uYzi9OKle42zqihKHQYfevlshwSPRyN7tUxo,287
 djgentelella/templates/gentelella/menu/notificacion.html,sha256=rF7Xf9dm1wdoUMkAF4E6xX7fOd4kqifLaHet0CO_P3o,1659
@@ -1030,9 +1032,9 @@ djgentelella/widgets/trees.py,sha256=bV6s-w1cgYahS0aNU6xBrx-aISdlzDZ23BFt3_3hAu4
 djgentelella/widgets/wysiwyg.py,sha256=wHeMyYNVE8-lKJ06A-0DLDAcRNv3TOAOG_Wl9DYZqS0,609
 djgentelella/wysiwyg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 djgentelella/wysiwyg/views.py,sha256=tI7LjLhCnohdvIEOEEhB2Cu1zxRmdcOhYJJX4LBIZaA,1159
-djgentelella-0.4.4.dist-info/AUTHORS,sha256=HyQoO-q7oXtavpNm7jaBVv8Vxx3c7yo33xkFkt4blkY,118
-djgentelella-0.4.4.dist-info/LICENSE.txt,sha256=wDzqAntLQORAL6vQhVdzZyfsPVvFStZKtkct5DIZjK0,18047
-djgentelella-0.4.4.dist-info/METADATA,sha256=iKgO9iJZjRE8qTE2A6wrnlzbqGYdOKPnaLEBa_1OaY0,27544
-djgentelella-0.4.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-djgentelella-0.4.4.dist-info/top_level.txt,sha256=88JbODVPV-P5q7ic25yMHt_FuuizaLzMyIaegpFa7Qk,13
-djgentelella-0.4.4.dist-info/RECORD,,
+djgentelella-0.4.6.dist-info/AUTHORS,sha256=HyQoO-q7oXtavpNm7jaBVv8Vxx3c7yo33xkFkt4blkY,118
+djgentelella-0.4.6.dist-info/LICENSE.txt,sha256=wDzqAntLQORAL6vQhVdzZyfsPVvFStZKtkct5DIZjK0,18047
+djgentelella-0.4.6.dist-info/METADATA,sha256=T5Kp761lzmXIaKSgud9uDBZmQPaW6o11ryIjlheH19U,27544
+djgentelella-0.4.6.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+djgentelella-0.4.6.dist-info/top_level.txt,sha256=88JbODVPV-P5q7ic25yMHt_FuuizaLzMyIaegpFa7Qk,13
+djgentelella-0.4.6.dist-info/RECORD,,