djgentelella 0.4.30__py3-none-any.whl → 0.5.0__py3-none-any.whl

djgentelella/__init__.py

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

djgentelella/admin.py

@@ -2,7 +2,7 @@ from django.contrib import admin
 
 from djgentelella.firmador_digital.models import UserSignatureConfig
 from djgentelella.models import MenuItem, Help, GentelellaSettings, Notification, \
-    ChunkedUpload
+    ChunkedUpload, Trash
 from djgentelella.models import PermissionsCategoryManagement
 from djgentelella.utils import clean_cache
 
@@ -33,6 +33,11 @@ class ChunkedUploadAdmin(admin.ModelAdmin):
 class UserSignatureConfigAdmin(admin.ModelAdmin):
     list_display = ('id', 'user', 'config')
 
+class TrashAdmin(admin.ModelAdmin):
+    list_display = ("id", "deleted_by", "content_type", "object_id", "object_repr", "created_at")
+    ordering = ("-created_at",)
+    search_fields = ("id",)
+
 admin.site.register(UserSignatureConfig, UserSignatureConfigAdmin)
 admin.site.register(ChunkedUpload, ChunkedUploadAdmin)
 admin.site.register(MenuItem, MenuAdmin)
@@ -40,3 +45,4 @@ admin.site.register(Help)
 admin.site.register(PermissionsCategoryManagement)
 admin.site.register(GentelellaSettings, GentelellaSettingsAdmin)
 admin.site.register(Notification, NotificationAdmin)
+admin.site.register(Trash, TrashAdmin)

djgentelella/firmador_digital/consumers/sign.py

@@ -12,7 +12,7 @@ from djgentelella.firmador_digital.utils import RemoteSignerClient
 from djgentelella.serializers.firmador_digital import (
     WSRequest,
     InitialSignatureSerializer,
-    CompleteSignatureSerializer,
+    CompleteSignatureSerializer, ValidateDocumentSerializer,
 )
 
 logger = logging.getLogger("djgentelella")
@@ -35,24 +35,30 @@ class SignConsumer(JsonWebsocketConsumer):
                 return InitialSignatureSerializer(data=content)
             if serializer.validated_data["action"] == "complete_signature":
                 return CompleteSignatureSerializer(data=content)
+            if serializer.validated_data["action"] == "validate_document":
+                return ValidateDocumentSerializer(data=content)
 
     def disconnect(self, close_code):
         super().disconnect(close_code)
+        logger.info(f"Disconnect {close_code}")
 
     def receive_json(self, content, **kwargs):
         """
         Called with decoded JSON content.
         """
+        socket_id = ""
         try:
             serializer = self.get_serializer(content)
 
             if serializer.is_valid():
-
+                socket_id = serializer.validated_data['socket_id']
                 match serializer.validated_data["action"]:
                     case "initial_signature":
                         self.do_initial_signature(serializer)
                     case "complete_signature":
                         self.do_complete_signature(serializer)
+                    case "validate_document":
+                        self.do_validate_document(serializer)
                     case _:
                         self.do_default(serializer)
             else:
@@ -63,6 +69,7 @@ class SignConsumer(JsonWebsocketConsumer):
                     "details": serializer.errors,
                     "status": 400,
                     "code": 11,
+                    'socket_id': serializer.data.get('socket_id')
                 })
                 logger.error("Invalid request.")
 
@@ -74,9 +81,20 @@ class SignConsumer(JsonWebsocketConsumer):
                 "details": str(e),
                 "status": 500,
                 "code": 999,
+                "socket_id": socket_id
             })
             logger.error("An unexpected error occurred.", exc_info=e)
 
+    def do_validate_document(self, serializer):
+        signer = RemoteSignerClient(self.scope["user"])
+
+        response = signer.validate_document(
+            instance=serializer.validated_data["instance"],
+        )
+
+        response['socket_id'] = serializer.validated_data['socket_id']
+        self.send_json(response)
+
     def do_initial_signature(self, serializer):
         signer = RemoteSignerClient(self.scope["user"])
 
@@ -87,6 +105,8 @@ class SignConsumer(JsonWebsocketConsumer):
             docsettings=serializer.validated_data["docsettings"],
         )
 
+        response['socket_id'] = serializer.validated_data['socket_id']
+
         # remove signer image
         if "imageIcon" in response:
             del response["imageIcon"]
@@ -103,7 +123,8 @@ class SignConsumer(JsonWebsocketConsumer):
             signer = RemoteSignerClient(self.scope["user"])
             data = dict(serializer.validated_data)
             response = signer.complete_signature(data)
-            self.send_json({"result": response})
+            self.send_json({"result": response,
+                            'socket_id': serializer.validated_data['socket_id']})
         except Exception as e:
             logger.error("Complete the signature fail", exc_info=e)
 

djgentelella/firmador_digital/forms.py

@@ -1,12 +1,20 @@
+import base64
 import logging
+from io import BytesIO
 
 from django import forms
 from django.core.exceptions import ValidationError
+from django.core.files.uploadedfile import UploadedFile
+from django.templatetags.static import static
+from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 
+from djgentelella.firmador_digital.models import UserSignatureConfig, \
+    get_signature_default, FORMATS_DATE, FONT_ALIGNMENT
 from djgentelella.firmador_digital.signvalue_utils import ValueDSParser
 from djgentelella.forms.forms import GTForm
 from djgentelella.widgets import core as genwidgets
+from djgentelella.widgets.core import FileInput
 
 logger = logging.getLogger('djgentelella')
 
@@ -26,3 +34,135 @@ class RenderValueForm(GTForm, ValueDSParser):
                 _("Invalid value not encoded as b64 o json parser error"),
                 code="invalid")
         return jsondata
+
+
+class SignatureConfigForm(GTForm, forms.ModelForm):
+    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")
+    )
+    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"),
+        initial="#FFFFFF",
+    )
+    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")
+    )
+    image = forms.ImageField(
+        required=False,
+        widget=FileInput,
+        label=_("Signature image")
+    )
+
+    default_render_type = "as_grid"
+
+    grid_representation = [
+        [["contact"]],
+        [["place"]],
+        [["reason"]],
+        [["image"], ["preview_image"]],
+        [["dateFormat"], ["isVisibleSignature"]],
+        [["fontSize"], ["fontColor"], ["fontAlignment"]],
+        [["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 preview_image(self):
+        label = _("Image preview")
+        src = static("gentelella/images/default.png")
+
+        if self.instance and self.instance.config:
+            image_b64 = self.instance.config.get("image")
+            if image_b64 and image_b64.startswith("data:image"):
+                src = image_b64
+
+        return mark_safe(f"""
+            <label for="image-preview"><strong>{label}:</strong></label><br>
+            <div class="d-flex justify-content-center">
+                <img id="image-preview" alt="{label}" src="{src}" style="max-height:100px; max-width:300px; display:block;">
+            </div>
+        """)
+
+    def save(self, commit=True):
+        data = get_signature_default()
+        prev_image = self.instance.config.get("image")
+
+        for key in data.keys():
+            if key in self.cleaned_data:
+                val = self.cleaned_data[key]
+                if key == "image":
+                    if isinstance(val, UploadedFile):
+                        # el usuario subió un nuevo archivo
+                        buffered = BytesIO()
+                        for chunk in val.chunks():
+                            buffered.write(chunk)
+                        mime = val.content_type
+                        b64 = base64.b64encode(buffered.getvalue()).decode()
+                        val = f"data:{mime};base64,{b64}"
+                    else:
+                        # no se subió archivo nuevo → conservamos imagen anterior
+                        val = prev_image
+
+                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,16 +1,33 @@
+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 = (
+    ('NONE', _('None')),
+    ('RIGHT', _('Right')),
+    ('LEFT', _('Left')),
+    ('TOP', _('Top')),
+    ('BOTTOM', _('Bottom')),
+)
+
+
 def get_signature_default():
     return {
-        "backgroundColor": "transparente",
+        "backgroundColor": "transparent",
         "cAdESLevel": "LTA",
         "contact": "",
         "country": "CR",
         "dateFormat": "dd/MM/yyyy hh\:mm\:ss a",
         "defaultSignMessage": "Esta es una representación gráfica únicamente,\nverifique la validez de la firma.",
         "font": "Nimbus Sans Regular",
-        "fontAlignment": "RIGHT",
+        "fontAlignment": "None",
         "fontColor": "000000",
         "fontSize": "7",
         "image": "",
@@ -25,6 +42,7 @@ def get_signature_default():
         "signY": "60",
         "xAdESLevel": "LTA",
         "isVisibleSignature": False,
+        "hideSignatureAdvice": False,
     }
 
 

djgentelella/firmador_digital/utils.py

@@ -47,6 +47,17 @@ class RemoteSignerClient:
         )
         return response.json()
 
+    def validate_document(self, instance):
+        b64doc = self.get_b64document(instance['value'])
+        files = {
+            "b64Document": b64doc,
+            "DocumentExtension": ".pdf",
+        }
+        response = requests.post(
+            settings.FIRMADOR_VALIDA_URL, json=files
+        )
+        return response.json()
+
     def _finalize_signature(self, data_to_sign, task):
         result = None
         error_msg = _("An unexpected error occurred during the signing process.")

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, request.FILES, 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/firmador_digital/viewsets.py

@@ -70,8 +70,19 @@ class DigitalSignatureRenderFileAPIView(APIView):
         return Response(file_data, content_type='application/pdf')
 
     def get_instance_file(self, instance, fieldname):
+        # check if instance and fieldname are not None
+        if not instance or not fieldname:
+            return None
+
         file_path = getattr(instance, fieldname)
-        file_data = None
-        with open(file_path.path, 'rb') as f:
-            file_data = f.read()
-        return file_data
+        if not file_path:
+            return None
+
+        # check if not file
+        try:
+            with open(file_path.path, 'rb') as f:
+                file_data = f.read()
+
+            return file_data
+        except (FileNotFoundError, OSError):
+            return None

djgentelella/forms/forms.py

@@ -69,6 +69,11 @@ class GTForm(forms.Form):
             case _:
                 self.renderer.form_template_name = self.template_name_horizontal
 
+    def get_error_for_grid(self, name):
+        if name in self.errors:
+            return self.errors[name]
+        return None
+
     @property
     def grid(self):
         """
@@ -97,10 +102,13 @@ class GTForm(forms.Form):
                     row_list = []
                     for field in col:
                         if field in dic_fields and dic_fields[field]:
-                            row_list.append(dic_fields[field])
+                            row_list.append(
+                                (dic_fields[field], self.get_error_for_grid(field))
+                            )
                         else:
                             if hasattr(self, field):
-                                row_list.append(getattr(self, field)())
+                                row_list.append((getattr(self, field)(),
+                                                 self.get_error_for_grid(field)))
                     col_list.append(row_list)
                 grid.append(col_list)
             return grid

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,70 @@ 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"
+
+msgid "This registry of trash does not exist."
+msgstr "Este registro de papelera no existe."
+
+msgid "The registry was successfully restored."
+msgstr "El registro fue restaurado con éxito."
+
+msgid "The registry could not be restored."
+msgstr "No se pudo restaurar el registro."
+msgid "Signature image"
+msgstr "Imagen de firma"
+
+msgid "Image preview"
+msgstr "Vista previa de imagen"
+
+msgid "Image signature"
+msgstr "Imagen de firma"
+msgid "Expand"
+msgstr "Expandir"

djgentelella/locale/es/LC_MESSAGES/djangojs.po

@@ -213,3 +213,12 @@ msgstr ""
 
 msgid "loading"
 msgstr "Cargando"
+
+msgid "Please, sign the document before saving"
+msgstr "Por favor, firme el documento antes de guardar"
+
+msgid "The document is not digitally signed. Please sign the document before saving."
+msgstr "El documento no está firmado digitalmente. Por favor, firme el documento antes de guardar."
+
+msgid "The document was saved"
+msgstr "El documento se ha guardado"

djgentelella/migrations/0014_trash.py

@@ -0,0 +1,31 @@
+# Generated by Django 5.1.6 on 2025-08-03 17:13
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contenttypes', '0002_remove_content_type_name'),
+        ('djgentelella', '0013_usersignatureconfig'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Trash',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('object_id', models.PositiveIntegerField(verbose_name='Object ID')),
+                ('object_repr', models.CharField(help_text='Value of str(instance) at deletion time', max_length=200, verbose_name='Object repr')),
+                ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='contenttypes.contenttype', verbose_name='Content type')),
+            ],
+            options={
+                'verbose_name': 'Trash',
+                'verbose_name_plural': 'Trash',
+                'ordering': ('id',),
+                'indexes': [models.Index(fields=['content_type', 'object_id'], name='djgentelell_content_9fa474_idx')],
+                'unique_together': {('content_type', 'object_id')},
+            },
+        ),
+    ]

djgentelella/migrations/0015_trash_deleted_by.py

@@ -0,0 +1,21 @@
+# Generated by Django 5.1.6 on 2025-08-03 17:29
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('djgentelella', '0014_trash'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='trash',
+            name='deleted_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='Deleted by'),
+        ),
+    ]

djgentelella/migrations/0016_trash_created_at.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.1.6 on 2025-08-03 17:54
+
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('djgentelella', '0015_trash_deleted_by'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='trash',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+    ]