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

djgentelella/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.4.10'
+__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/forms.py

@@ -1,14 +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, FONT_CHOICES
+    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')
 
@@ -31,12 +37,6 @@ class RenderValueForm(GTForm, ValueDSParser):
 
 
 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,
@@ -56,12 +56,6 @@ class SignatureConfigForm(GTForm, forms.ModelForm):
         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,
@@ -73,6 +67,7 @@ class SignatureConfigForm(GTForm, forms.ModelForm):
         widget=genwidgets.ColorInput,
         required=True,
         label=_("Font color"),
+        initial="#FFFFFF",
     )
     fontSize = forms.IntegerField(
         min_value=5,
@@ -98,6 +93,11 @@ class SignatureConfigForm(GTForm, forms.ModelForm):
         widget=genwidgets.YesNoInput,
         label=_("Visible signature")
     )
+    image = forms.ImageField(
+        required=False,
+        widget=FileInput,
+        label=_("Signature image")
+    )
 
     default_render_type = "as_grid"
 
@@ -105,10 +105,9 @@ class SignatureConfigForm(GTForm, forms.ModelForm):
         [["contact"]],
         [["place"]],
         [["reason"]],
-        # [["dateFormat"], ["font"]],
+        [["image"], ["preview_image"]],
         [["dateFormat"], ["isVisibleSignature"]],
-        [["fontSize"], ["fontColor"], ["backgroundColor"], ["fontAlignment"]],
-        # [["isVisibleSignature"]],
+        [["fontSize"], ["fontColor"], ["fontAlignment"]],
         [["defaultSignMessage"]],
     ]
 
@@ -125,14 +124,45 @@ class SignatureConfigForm(GTForm, forms.ModelForm):
             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

@@ -4,34 +4,30 @@ 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"),
+    ("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"),
+    ("dd-MM-yyyy", "dd-MM-yyyy"),
 ]
 
-FONT_ALIGNMENT = [
-    ("LEFT", _("LEFT")),
-    ("CENTER", _("CENTER")),
-    ("RIGHT", _("RIGHT")),
-]
+FONT_ALIGNMENT = (
+    ('NONE', _('None')),
+    ('RIGHT', _('Right')),
+    ('LEFT', _('Left')),
+    ('TOP', _('Top')),
+    ('BOTTOM', _('Bottom')),
+)
 
-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",
+        "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": "",
@@ -46,6 +42,7 @@ def get_signature_default():
         "signY": "60",
         "xAdESLevel": "LTA",
         "isVisibleSignature": False,
+        "hideSignatureAdvice": False,
     }
 
 

djgentelella/firmador_digital/views.py

@@ -13,7 +13,7 @@ def update_signature_settings(request):
 
 
     if request.method == "POST":
-        form = SignatureConfigForm(request.POST, instance=config, render_type="as_grid")
+        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."))

djgentelella/locale/es/LC_MESSAGES/django.po

@@ -665,3 +665,21 @@ 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/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/models.py

@@ -5,6 +5,10 @@ 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
 
 
 class GentelellaSettings(models.Model):
@@ -123,3 +127,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 _("Registration in trash: %(obj)s") % {"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.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()
+