djgentelella 0.3.29__py3-none-any.whl → 0.4.1__py3-none-any.whl

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/locale/es/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-15 03:43+0000\n"
-"PO-Revision-Date: 2025-02-14 21:45-0600\n"
+"POT-Creation-Date: 2025-03-29 22:37+0000\n"
+"PO-Revision-Date: 2025-03-29 16:43-0600\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: es\n"
@@ -103,6 +103,36 @@ msgstr ""
 "Estructura inválida, necesitas proporcionar {name: 'nombre del archivo', "
 "value:'representación en cadena base64'}"
 
+msgid "Invalid request."
+msgstr "Petición inválida."
+
+msgid "An unexpected error occurred."
+msgstr "Ha ocurrido un error inesperado.."
+
+msgid "Card"
+msgstr "Carta"
+
+msgid "Invalid value not encoded as b64 o json parser error"
+msgstr ""
+"Valor inválido, debe ser un documento base64 o un error al parsear el json"
+
+msgid "An unexpected error occurred during the signing process."
+msgstr ""
+"Un error inesperado ha ocurrido durante el proceso de firmado de documentos."
+
+msgid "An error occurred while communicating with the signing service."
+msgstr ""
+"Ha ocurrido un error al conectar con los servicios de firmado de documentos."
+
+msgid "Unable to connect to the signing service."
+msgstr "No se puede conectar con los servicios de firmado."
+
+msgid "The request to the signing service timed out."
+msgstr "El tiempo de espera del servicio de firma ha expirado."
+
+msgid "An exception ocurred el request to the signing service."
+msgstr "Un error ha ocurrido enviando la petición a los servicios de firmado."
+
 #, python-brace-format
 msgid "Do you want to delete {obj}?"
 msgstr "¿Desea eliminar {obj}?"
@@ -333,9 +363,6 @@ msgstr "Enlace es válido por %(expiration_days)s días."
 msgid "Account activation on"
 msgstr "Activación de cuentas"
 
-msgid "vendors/animate.css/animate.min.css"
-msgstr "vendors/animate.css/animate.min.css"
-
 msgid "Login"
 msgstr "Iniciar sesión"
 
@@ -345,7 +372,7 @@ msgstr ""
 
 msgid ""
 "Your account doesn't have access to this page. To proceed,\n"
-"                        please login with an account that has access."
+"\t\t\t\t\t\t\tplease login with an account that has access."
 msgstr ""
 "Su cuenta no tiene permisos de acceso para ver esta página. Para proceder,\n"
 "                        por favor inicie sesión con otra cuenta con permisos "
@@ -514,6 +541,76 @@ msgstr "Sí"
 msgid "Delete this file"
 msgstr "Eliminar este archivo"
 
+msgid "Reload"
+msgstr "Recargar"
+
+msgid "The signed option is not available."
+msgstr "La opción firmada no está disponible."
+
+msgid "We did not find an electronic signature card."
+msgstr "No encontramos una tarjeta de firma electrónica."
+
+msgid "Please make sure to comply with the notices or resolve the errors."
+msgstr "Asegúrese de cumplir con los avisos o resuelva los errores."
+
+msgid "Choose your signature card"
+msgstr "Selecciona tu tarjeta de firma"
+
+msgid "Electronic signature card"
+msgstr "Tarjeta de firma electrónica"
+
+msgid "Sign"
+msgstr "Firmar"
+
+msgid "Notices"
+msgstr "Avisos"
+
+msgid "You need Firmador Libre installed in order to sign."
+msgstr "Necesitas instalar Firmador Libre para firmar."
+
+msgid "Make sure your version is 1.9.8 or later."
+msgstr "Asegúrate de que tu versión sea 1.9.8 o posterior."
+
+msgid "Run the application before proceeding with the signature."
+msgstr "Ejecuta la aplicación antes de proceder con la firma."
+
+msgid "If the autolauncher doesn't work, I used this command line."
+msgstr "Si el lanzador automático no funciona, usé esta línea de comandos."
+
+msgid "Show command"
+msgstr "Mostrar comando"
+
+msgid "Copied to clipboard"
+msgstr "Copiado al portapapeles"
+
+msgid "Copy to clipboard"
+msgstr "Copiar al portapapeles"
+
+msgid "Download Firmador Libre"
+msgstr "Descargar Firmador Libre"
+
+msgid "Download app"
+msgstr "Descargar aplicación"
+
+msgid "Run Firmador Libre"
+msgstr "Ejecutar Firmador Libre"
+
+msgid "Run app"
+msgstr "Ejecutar aplicación"
+
+msgid ""
+"Please go to the last page, in the signature space, try to place your "
+"signature vertically centered."
+msgstr ""
+"Por favor, vaya a la última página, en el espacio de firma, intente colocar "
+"su firma verticalmente centrada."
+
+msgid "Loading..."
+msgstr "Cargando..."
+
+msgid "Please wait while the document is being signed."
+msgstr "Por favor, espere mientras se firma el documento."
+
 msgid "Start"
 msgstr "Iniciar"
 

djgentelella/locale/es/LC_MESSAGES/djangojs.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-23 22:28-0600\n"
-"PO-Revision-Date: 2024-12-23 22:35-0600\n"
+"POT-Creation-Date: 2025-03-29 16:37-0600\n"
+"PO-Revision-Date: 2025-03-29 16:45-0600\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: es\n"
@@ -45,6 +45,111 @@ msgstr "Grabar"
 msgid "Recording..."
 msgstr "Grabando..."
 
+msgid "Error when applying setting to signature: "
+msgstr "Error aplicando las propiedades de firma digital "
+
+msgid "Error loading content: "
+msgstr "Error cargando contenido: "
+
+msgid "Error loading image"
+msgstr "Error cargando imagen"
+
+msgid "Error"
+msgstr "Error"
+
+msgid "Errors"
+msgstr "Errores"
+
+msgid "Warning"
+msgstr "Advertencia"
+
+msgid "The signing was successfully completed."
+msgstr "La firma se ha completado correctamente."
+
+msgid "Success"
+msgstr "Éxito"
+
+msgid ""
+"An error has occurred in the internal server of the uncontrolled 'Firmador "
+"Libre'."
+msgstr ""
+"Ha ocurrido un error en el servidor interno del no controlado 'Firmador "
+"Libre'."
+
+msgid ""
+"Make sure to start the 'Firmador Libre' application. If it is already "
+"running, please press the reload button."
+msgstr ""
+"Asegúrate de iniciar la aplicación 'Firmador Libre'. Si ya está en "
+"ejecución, presiona el botón de recarga."
+
+msgid ""
+"There is no card connected to the device. Please press the reload button and "
+"connect your card."
+msgstr ""
+"No hay tarjeta conectada al dispositivo. Presiona el botón de recarga y "
+"conecta tu tarjeta."
+
+msgid ""
+"The internal signature service does not work. Please contact the support."
+msgstr "El servicio de firma interna no funciona. Contacta con el soporte."
+
+msgid ""
+"Authentication failed because the PIN entry window was detected closed, "
+"please try again."
+msgstr ""
+"La autenticación falló porque la ventana de entrada PIN fue detectada "
+"cerrada, intenta de nuevo."
+
+msgid ""
+"The device was disconnected, possibly the window was closed for signature. "
+"Please close the window for the authentication PIN."
+msgstr ""
+"El dispositivo se desconectó, posiblemente la ventana para la firma se "
+"cerró. Cierra la ventana para la autenticación PIN."
+
+msgid "The new signature field position overlaps with an existing signature."
+msgstr "El nuevo campo de firma se superpone con una firma existente."
+
+msgid "The new signature field position is outside the page dimensions."
+msgstr "El nuevo campo de firma está fuera de los límites de la página."
+
+msgid "The version of one or more libraries is incompatible."
+msgstr "La versión de una o más bibliotecas es incompatible."
+
+msgid "The cryptographic provider is not available."
+msgstr "El proveedor de criptografía no está disponible."
+
+msgid "The signing algorithm is not available."
+msgstr "El algoritmo de firma no está disponible."
+
+msgid ""
+"Errors have been encountered in the data to be sent to the 'Free Signer'. "
+"Please press the reload button and try again."
+msgstr ""
+"Se han encontrado errores en los datos que se enviarán al 'Firmador Libre'. "
+"Presiona el botón de recarga y intenta de nuevo."
+
+msgid ""
+"The request to the signing service timed out. Please, press the reload "
+"button and try again."
+msgstr ""
+"El tiempo de espera del servicio de firma ha expirado. Presiona el botón de "
+"recarga y intenta de nuevo."
+
+msgid ""
+"We're sorry, an unexpected error occurred. Please, press the reload button "
+"and try again."
+msgstr ""
+"Lo sentimos, ha ocurrido un error inesperado. Presiona el botón de recarga y "
+"intenta de nuevo."
+
+msgid "Accept"
+msgstr "Aceptar"
+
+msgid "Cancel"
+msgstr "Cancelar"
+
 msgid " Records Selected"
 msgstr " Grabar seleccionado"
 
@@ -81,12 +186,6 @@ msgstr "Descargar"
 msgid "Clear Filters"
 msgstr "Limpiar Filtros"
 
-msgid "Success"
-msgstr "Éxito"
-
-msgid "Error"
-msgstr "Error"
-
 msgid "Actions"
 msgstr "Acciones"
 

djgentelella/management/commands/createbasejs.py

@@ -29,6 +29,7 @@ class Command(BaseCommand):
             'calendar.js',
             'timeline.js',
             'mediarecord.js',
+            'digital_signature.js',
             'api_list.js',
             'tagify.js'
         ]
@@ -41,12 +42,14 @@ class Command(BaseCommand):
         ]
 
         with open(basepath / 'base.js', 'w') as fwriter:
+            # load jquery plugins
             fwriter.write("(function($){\n")
             for f in jquery_plugins:
                 with open(basepath / 'base' / f, 'r') as rfile:
                     fwriter.write("\n%s\n" % (rfile.read()))
             fwriter.write("})(jQuery)\n")
 
+            # load base files
             for f in basefiles:
                 with open(basepath / 'base' / f, 'r') as rfile:
                     fwriter.write("\n%s\n" % (rfile.read()))

djgentelella/management/commands/loaddevstatic.py

@@ -375,8 +375,26 @@ class Command(BaseCommand):
                 'https://cdnjs.cloudflare.com/ajax/libs/pdf.js/4.6.82/pdf.worker.min.mjs',
                 'https://cdnjs.cloudflare.com/ajax/libs/interact.js/1.10.27/interact.min.js',
             ],
+
             'htmlx': [
                 'https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js'
+            ],
+            'pdfjs/images/': [
+                "https://cdnjs.cloudflare.com/ajax/libs/pdf.js/4.6.82/images/messageBar_warning.svg",
+                "https://cdnjs.cloudflare.com/ajax/libs/pdf.js/4.6.82/images/messageBar_closingButton.svg",
+                "https://cdnjs.cloudflare.com/ajax/libs/pdf.js/4.6.82/images/cursor-editorInk.svg",
+                "https://cdnjs.cloudflare.com/ajax/libs/pdf.js/4.6.82/images/cursor-editorTextHighlight.svg",
+                "https://cdnjs.cloudflare.com/ajax/libs/pdf.js/4.6.82/images/cursor-editorFreeHighlight.svg",
+                "https://cdnjs.cloudflare.com/ajax/libs/pdf.js/4.6.82/images/altText_warning.svg",
+                "https://cdnjs.cloudflare.com/ajax/libs/pdf.js/4.6.82/images/cursor-editorFreeText.svg",
+                "https://cdnjs.cloudflare.com/ajax/libs/pdf.js/4.6.82/images/editor-toolbar-delete.svg",
+                "https://cdnjs.cloudflare.com/ajax/libs/pdf.js/4.6.82/images/toolbarButton-editorHighlight.svg",
+                "https://cdnjs.cloudflare.com/ajax/libs/pdf.js/4.6.82/images/altText_add.svg",
+                "https://cdnjs.cloudflare.com/ajax/libs/pdf.js/4.6.82/images/altText_done.svg",
+                "https://cdnjs.cloudflare.com/ajax/libs/pdf.js/4.6.82/images/altText_disclaimer.svg",
+                "https://cdnjs.cloudflare.com/ajax/libs/pdf.js/4.6.82/images/altText_spinner.svg",
+                "https://cdnjs.cloudflare.com/ajax/libs/pdf.js/4.6.82/images/toolbarButton-menuArrow.svg",
+                "https://cdnjs.cloudflare.com/ajax/libs/pdf.js/4.6.82/images/loading-icon.gif"
             ]
         }
         compressed = {

djgentelella/migrations/0013_usersignatureconfig.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.1.5 on 2025-02-04 14:22
+
+import django.db.models.deletion
+import djgentelella.firmador_digital.models
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('djgentelella', '00012_defaultusecompessstatic'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='UserSignatureConfig',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('config', models.JSONField(default=djgentelella.firmador_digital.models.get_signature_default)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

djgentelella/serializers/firmador_digital.py

@@ -0,0 +1,103 @@
+import base64
+import json
+import logging
+
+from rest_framework import serializers
+
+logger = logging.getLogger('djgentelella')
+
+
+class DocumentSettingsSerializer(serializers.Serializer):
+    pageNumber = serializers.IntegerField(min_value=1, default=1)
+    signWidth = serializers.IntegerField(min_value=1, default=133)
+    signHeight = serializers.IntegerField(min_value=1, default=33)
+    signX = serializers.IntegerField(min_value=0, default=198)
+    signY = serializers.IntegerField(min_value=0, default=0)
+
+
+class InstanceSerializer(serializers.Serializer):
+    pk = serializers.IntegerField()
+    cc = serializers.IntegerField()
+    value = serializers.CharField()
+
+    def get_json_file(self, value):
+        jsondata = None
+        try:
+            instance = base64.b64decode(value.encode())
+            jsondata = json.loads(instance.decode())
+        except Exception as e:
+            logger.error("Validation of value on digital signature fail", exc_info=e)
+        return jsondata
+
+    def get_file_from_token(self, token):
+        from djgentelella.models import ChunkedUpload
+        tmpupload = ChunkedUpload.objects.filter(upload_id=token).first()
+        dev = None
+        if tmpupload:
+            dev = tmpupload.get_uploaded_file().read()
+        return dev
+
+    def get_instance_file(self, instance, fieldname):
+        file_path = getattr(instance, fieldname)
+        file_data = None
+        with open(file_path.path, 'rb') as f:
+            file_data = f.read()
+        return file_data
+
+    def validate_value(self, data):
+        jsonparse = self.get_json_file(data)
+        if not jsonparse:
+            raise serializers.ValidationError("Invalid encode value")
+        return jsonparse
+
+    def validate(self, attrs):
+        from django.contrib.contenttypes.models import ContentType
+        cc = attrs.get("cc")
+        pk = attrs.get("pk")
+        ccinstance = ContentType.objects.get_for_id(cc)
+        instance = ccinstance.get_object_for_this_type(pk=pk)
+        value = attrs.get("value")
+        if 'token' in value:
+            attrs['value'] = self.get_file_from_token(value['token'])
+        elif 'field_name' in value:
+            attrs['value'] = self.get_instance_file(instance, value['field_name'])
+        return attrs
+
+
+class RequestInitialDoc(serializers.Serializer):
+    docsettings = DocumentSettingsSerializer()
+
+
+class WSRequest(serializers.Serializer):
+    action = serializers.CharField()
+
+
+class CardSerializer(serializers.Serializer):
+    certificate = serializers.CharField()
+    commonName = serializers.CharField()
+    firstName = serializers.CharField()
+    identification = serializers.CharField()
+    lastName = serializers.CharField()
+    tokenSerialNumber = serializers.CharField()
+
+
+class SignatureSerializer(serializers.Serializer):
+    algorithm = serializers.CharField()
+    value = serializers.CharField()
+
+
+class InitialSignatureSerializer(serializers.Serializer):
+    action = serializers.CharField()
+    docsettings = DocumentSettingsSerializer()
+    card = CardSerializer()
+    logo_url = serializers.CharField(required=False, allow_null=True, allow_blank=True)
+    instance = InstanceSerializer()
+
+
+class CompleteSignatureSerializer(serializers.Serializer):
+    action = serializers.CharField()
+    documentid = serializers.CharField()
+    certificate = serializers.CharField()
+    signature = SignatureSerializer()
+    logo_url = serializers.CharField(required=False, allow_null=True, allow_blank=True)
+    instance = InstanceSerializer()

djgentelella/settings.py

@@ -42,7 +42,7 @@ try:
 except Exception as e:
     from django.contrib.auth.models import User
 
-#####################################################
+############################################
 #    Chunked Upload
 ############################################
 
@@ -83,5 +83,7 @@ CONTENT_TYPE = getattr(settings, 'CHUNKED_UPLOAD_CONTENT_TYPE',
 DEFAULT_MAX_BYTES = None
 MAX_BYTES = getattr(settings, 'CHUNKED_UPLOAD_MAX_BYTES', DEFAULT_MAX_BYTES)
 
-#############################################################
+############################################
 #   END UPLOAD CHUNKED
+
+

djgentelella/static/djgentelella.readonly.vendors.min.css

@@ -1514,7 +1514,7 @@
 }
 .tl-timegroup .tl-timegroup-message {
   color: #e0e0e0;
-  text-shadow: #FFF 0px 2px 2px;
+  text-shadow: #FFF 0 2px 2px;
   margin-left: 80px;
 }
 .tl-timegroup.tl-timegroup-alternate {