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

djgentelella/history/serializers.py

@@ -0,0 +1,50 @@
+from django.contrib.admin.models import LogEntry
+from django.contrib.contenttypes.models import ContentType
+from django.utils.translation import gettext_lazy as _
+from rest_framework import serializers
+from djgentelella.serializers import GTDateField, GTDateTimeField
+
+
+
+class HistorySerializer(serializers.ModelSerializer):
+    user = serializers.SerializerMethodField()
+    action_flag = serializers.SerializerMethodField()
+    action_time = GTDateTimeField()
+    change_message = serializers.SerializerMethodField()
+    actions = serializers.SerializerMethodField()
+
+    def get_user(self, obj):
+        if not obj or not obj.user:
+            return _("No user found")
+        name = obj.user.get_full_name()
+        return name or obj.user.username
+
+    def get_action_flag(self, obj):
+        if obj.action_flag == 4:
+            return _("Hard deleted")
+        elif obj.action_flag == 5:
+            return _("Restored")
+
+        return obj.get_action_flag_display()
+
+    def get_change_message(self, obj):
+        return obj.change_message
+
+    def get_actions(self, obj):
+        return {
+            "create": False,
+            "update": False,
+            "destroy": False,
+        }
+
+    class Meta:
+        model = LogEntry
+        fields = "__all__"
+
+
+class HistoryDataTableSerializer(serializers.Serializer):
+    data = serializers.ListField(child=HistorySerializer(), required=True)
+    draw = serializers.IntegerField(required=True)
+    recordsFiltered = serializers.IntegerField(required=True)
+    recordsTotal = serializers.IntegerField(required=True)
+

djgentelella/history/utils.py

@@ -0,0 +1,70 @@
+from django.utils.translation import gettext_lazy as _
+from django.contrib.admin.models import LogEntry, ADDITION, CHANGE, DELETION
+from django.contrib.contenttypes.models import ContentType
+
+HARD_DELETION = 4
+RESTORE = 5
+
+ACTIONS = {
+    ADDITION: _("created"),
+    CHANGE: _("updated"),
+    DELETION: _("deleted"),
+    HARD_DELETION: _("hard deleted"),
+    RESTORE: _("restored"),
+}
+
+
+def add_log(
+    user,
+    object,
+    action_flag,
+    model_name=None,
+    changed_data=None,
+    object_repr="",
+    change_message="",
+    content_type=None,
+):
+    if content_type is None:
+        content_type = ContentType.objects.get_for_model(object)
+
+    if model_name is None:
+        model_name = object._meta.verbose_name
+
+    if not isinstance(action_flag, int):
+        raise ValueError("action_flag must be an integer")
+
+    action_label = ACTIONS.get(action_flag, str(action_flag))
+
+    if not object_repr:
+        object_repr = _("An object of model %(model)s has been %(action)s") % {
+            "model": _(str(model_name).capitalize()),
+            "action": action_label,
+        }
+
+    changed_data = changed_data or []
+
+    if change_message:
+        if action_flag != DELETION and changed_data:
+            verbose_changes = [object._meta.get_field(f).verbose_name for f in
+                               changed_data]
+
+            change_message = _("%(msg)s. Fields: %(fields)s") % {
+                "msg": change_message,
+                "fields": ", ".join(verbose_changes),
+            }
+        else: # delete, restore, hard delete
+            change_message = _("The record %(obj)s of model %(model)s has been %(action)s") % {
+                "obj": str(object),
+                "model": _(model_name),
+                "action": action_label,
+            }
+
+    LogEntry.objects.log_action(
+        user_id=user.id,
+        content_type_id=content_type.id,
+        object_id=object.pk,
+        object_repr=object_repr,
+        action_flag=action_flag,
+        change_message=change_message,
+    )
+

djgentelella/locale/es/LC_MESSAGES/django.po

@@ -616,3 +616,108 @@ 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"
+
+# history
+msgid "Restoration"
+msgstr "Restaurado"
+
+msgid "deleted"
+msgstr "eliminado"
+
+msgid "Hard deleted"
+msgstr "Eliminación permanente"
+
+msgid "History"
+msgstr "Historial"
+
+msgid "General"
+msgstr "General"
+
+msgid "restored"
+msgstr "restaurado"
+
+msgid "Restored"
+msgstr "Restaurado"
+
+msgid "hard deleted"
+msgstr "eliminado permanentemente"
+
+msgid "%(msg)s. Fields: %(fields)s"
+msgstr "%(msg)s. Campos: %(fields)s"
+
+msgid "The record %(obj)s of model %(model)s has been %(action)s"
+msgstr "El registro %(obj)s del modelo %(model)s ha sido %(action)s"
+
+msgid "An object of model %(model)s has been %(action)s"
+msgstr "Un objeto del modelo %(model)s ha sido %(action)s"
+
+msgid "%(obj)s in trash"
+msgstr "%(obj)s en papelera"

djgentelella/locale/es/LC_MESSAGES/djangojs.po

@@ -213,3 +213,49 @@ 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"
+
+# history
+msgid "Restoration"
+msgstr "Restaurado"
+
+msgid "deleted"
+msgstr "eliminado"
+
+msgid "Hard deleted"
+msgstr "Eliminación permanente"
+
+msgid "History"
+msgstr "Historial"
+
+msgid "General"
+msgstr "General"
+
+msgid "restored"
+msgstr "restaurado"
+
+msgid "Restored"
+msgstr "Restaurado"
+
+msgid "hard deleted"
+msgstr "eliminado permanentemente"
+
+msgid "%(msg)s. Fields: %(fields)s"
+msgstr "%(msg)s. Campos: %(fields)s"
+
+msgid "The record %(obj)s of model %(model)s has been %(action)s"
+msgstr "El registro %(obj)s del modelo %(model)s ha sido %(action)s"
+
+msgid "An object of model %(model)s has been %(action)s"
+msgstr "Un objeto del modelo %(model)s ha sido %(action)s"
+
+msgid "%(obj)s in trash"
+msgstr "%(obj)s en papelera"

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,
+        ),
+    ]

djgentelella/migrations/0017_alter_chunkedupload_status.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.5 on 2025-08-29 23:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('djgentelella', '0016_trash_created_at'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='chunkedupload',
+            name='status',
+            field=models.PositiveSmallIntegerField(choices=[(1, 'Uploading'), (2, 'Complete')], default=1),
+        ),
+    ]

djgentelella/migrations/0018_alter_chunkedupload_status.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.5 on 2025-08-29 23:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('djgentelella', '0017_alter_chunkedupload_status'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='chunkedupload',
+            name='status',
+            field=models.PositiveSmallIntegerField(choices=[(1, 'Subiendo'), (2, 'Completo')], default=1),
+        ),
+    ]

djgentelella/models.py

@@ -5,7 +5,12 @@ from django.utils.translation import gettext_lazy as _
 from tree_queries.models import TreeNode
 
 from djgentelella.chunked_upload.models import AbstractChunkedUpload
+from django.contrib.contenttypes.models import ContentType
+from django.contrib.contenttypes.fields import GenericForeignKey
+from .models_manager import ObjectManager, AllObjectsManager, \
+    DeletedObjectsManager
 
+from djgentelella.history.utils import add_log, ADDITION
 
 class GentelellaSettings(models.Model):
     """
@@ -123,3 +128,95 @@ class ChunkedUpload(AbstractChunkedUpload):
         null=DEFAULT_MODEL_USER_FIELD_NULL,
         blank=DEFAULT_MODEL_USER_FIELD_BLANK
     )
+
+
+# Trash
+class Trash(models.Model):
+    """
+        Trash generic. Each row represents an instance deleted.
+    """
+    content_type = models.ForeignKey(ContentType, on_delete=models.PROTECT,
+                                     verbose_name=_("Content type"))
+    object_id = models.PositiveIntegerField(verbose_name=_("Object ID"))
+    content_object = GenericForeignKey("content_type", "object_id")
+    object_repr = models.CharField(
+        _("Object repr"), max_length=200,
+        help_text=_("Value of str(instance) at deletion time"),
+    )
+    deleted_by = models.ForeignKey(
+        User,
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        verbose_name=_("Deleted by")
+    )
+    created_at = models.DateTimeField(auto_now_add=True)
+
+    class Meta:
+        ordering = ("id",)
+        unique_together = ("content_type", "object_id")
+        indexes = [
+            models.Index(fields=["content_type", "object_id"]),
+        ]
+        verbose_name = _("Trash")
+        verbose_name_plural = _("Trash")
+
+    def __str__(self):
+        return _("%(obj)s in trash") % {"obj": self.object_repr}
+
+    def restore(self, user=None):
+        obj = self.content_object
+
+        # if `is_deleted` is in the model, unmark it
+        if hasattr(obj, "restore"):
+            obj.restore()
+
+        self.delete()  # delete the instance of trash
+
+
+    def hard_delete(self):
+        """
+            Permanent deletion of the original object and then the trash entry.
+        """
+        obj = self.content_object
+
+        if obj is None:
+            return
+
+        obj.delete(hard=True)
+
+        super().delete()
+
+
+class DeletedWithTrash(models.Model):
+    is_deleted = models.BooleanField(default=False, db_index=True)
+
+    objects = ObjectManager()
+    objects_with_deleted = AllObjectsManager()
+    objects_deleted_only = DeletedObjectsManager()
+
+    class Meta:
+        abstract = True
+
+    def delete(self, using=None, keep_parents=False, *, hard=False, user=None):
+        if hard:
+            # Permanent deletion
+            return super().delete(using=using, keep_parents=keep_parents)
+
+        self.is_deleted = True
+        self.save(update_fields=["is_deleted"])
+
+        # create trash instance
+        trash = Trash.objects.get_or_create(
+            content_type=ContentType.objects.get_for_model(self.__class__),
+            object_id=self.pk,
+            defaults={
+                "object_repr": str(self)[:200],
+                "deleted_by": user,
+            },
+        )
+
+    # Restore an object
+    def restore(self):
+        self.is_deleted = False
+        self.save(update_fields=["is_deleted"])

djgentelella/models_manager.py

@@ -0,0 +1,40 @@
+from django.db import models
+
+
+class ObjectQuerySet(models.QuerySet):
+    # Non-deleted records
+    def alive(self):
+        return self.filter(is_deleted=False)
+
+    # Only deleted records
+    def dead(self):
+        return self.filter(is_deleted=True)
+
+    # Overridden delete (soft delete)
+    def delete(self):
+        return super().update(is_deleted=True)
+
+    # Permanent deletion
+    def hard_delete(self):
+        return super().delete()
+
+    # Bulk restore
+    def restore(self):
+        return self.update(is_deleted=False)
+
+
+class ObjectManager(models.Manager):
+    # Only alive objects by default
+    def get_queryset(self):
+        return ObjectQuerySet(self.model, using=self._db).alive()
+
+class AllObjectsManager(models.Manager):
+    # Explicit access to all objects
+    def get_queryset(self):
+        return ObjectQuerySet(self.model, using=self._db)
+
+class DeletedObjectsManager(models.Manager):
+    # Only deleted objects
+    def get_queryset(self):
+        return ObjectQuerySet(self.model, using=self._db).dead()
+

djgentelella/serializers/firmador_digital.py

@@ -69,7 +69,8 @@ class RequestInitialDoc(serializers.Serializer):
 
 
 class WSRequest(serializers.Serializer):
-    action = serializers.CharField()
+    action = serializers.CharField(required=True)
+    socket_id = serializers.CharField(required=True)
 
 
 class CardSerializer(serializers.Serializer):
@@ -88,6 +89,7 @@ class SignatureSerializer(serializers.Serializer):
 
 class InitialSignatureSerializer(serializers.Serializer):
     action = serializers.CharField()
+    socket_id = serializers.CharField(required=True)
     docsettings = DocumentSettingsSerializer()
     card = CardSerializer()
     logo_url = serializers.CharField(required=False, allow_null=True, allow_blank=True)
@@ -96,8 +98,14 @@ class InitialSignatureSerializer(serializers.Serializer):
 
 class CompleteSignatureSerializer(serializers.Serializer):
     action = serializers.CharField()
+    socket_id = serializers.CharField(required=True)
     documentid = serializers.CharField()
     certificate = serializers.CharField()
     signature = SignatureSerializer()
     logo_url = serializers.CharField(required=False, allow_null=True, allow_blank=True)
     instance = InstanceSerializer()
+
+class ValidateDocumentSerializer(serializers.Serializer):
+    action = serializers.CharField()
+    socket_id = serializers.CharField(required=True)
+    instance = InstanceSerializer()

djgentelella/serializers/selects.py

@@ -30,3 +30,17 @@ class GTS2SerializerBase(serializers.Serializer):
     text = serializers.SerializerMethodField()
     disabled = serializers.SerializerMethodField()
     selected = serializers.SerializerMethodField()
+
+
+class ChoicesGTS2Serializer(GTS2SerializerBase):
+    def __init__(self, *args, choices=None, **kwargs):
+        self.choices = dict(choices)
+        super().__init__(*args, **kwargs)
+
+    def get_id(self, obj):
+        return obj
+
+    def get_text(self, obj):
+        if obj in self.choices:
+            return self.choices[obj]
+        return obj

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

@@ -808,6 +808,7 @@
   position: relative;
   overflow: hidden;
   border-top: 1px solid #e5e5e5;
+  direction: ltr;
 }
 .tl-timenav .tl-timenav-line {
   position: absolute;
@@ -2018,7 +2019,6 @@
 .tl-slidenav-previous .tl-slidenav-content-container,
 .tl-slidenav-next .tl-slidenav-content-container {
   width: 100px;
-  position: absolute;
 }
 .tl-slidenav-previous .tl-slidenav-title,
 .tl-slidenav-next .tl-slidenav-title,
@@ -2104,7 +2104,7 @@
 .tl-slidenav-next {
   text-align: right;
   margin-right: 10px;
-  right: 100px;
+  right: 0;
 }
 .tl-slidenav-next .tl-slidenav-title,
 .tl-slidenav-next .tl-slidenav-description {
@@ -2118,6 +2118,7 @@
 }
 .tl-slidenav-previous {
   text-align: left;
+  left: 0;
   margin-left: 10px;
 }
 .tl-slidenav-previous .tl-slidenav-icon {
@@ -2126,6 +2127,12 @@
 .tl-slidenav-previous .tl-slidenav-icon:before {
   content: "\e650";
 }
+[dir="rtl"] .tl-slidenav-previous {
+  direction: ltr;
+}
+[dir="rtl"] .tl-slidenav-next:hover .tl-slidenav-icon {
+  margin-right: -4px;
+}
 /* NAVIGATION HOVER
 ================================================== */
 .tl-slidenav-previous:hover .tl-slidenav-title,
@@ -2154,9 +2161,6 @@
 .tl-slidenav-previous:focus-visible .tl-slidenav-icon {
   margin-left: -4px;
 }
-.tl-skinny .tl-slidenav-next {
-  right: 32px;
-}
 .tl-skinny .tl-slidenav-next .tl-slidenav-icon {
   margin-left: 8px;
 }