From c71105641a0a73465e1009b644d2580994466f6a Mon Sep 17 00:00:00 2001
From: Valeria Vitti <valeria.vitti@dyrecta.com>
Date: Mon, 28 Oct 2024 11:57:21 +0100
Subject: [PATCH] inserimento testo in datatable multimedia risoluzione bug
 inserimento tipologia multimedia

---
 sistema/datatables.py              |  6 ++++--
 sistema/forms.py                   | 13 +++++++------
 sistema/templates/add_mod_poi.html |  5 +++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/sistema/datatables.py b/sistema/datatables.py
index 9087b03..9dd927e 100644
--- a/sistema/datatables.py
+++ b/sistema/datatables.py
@@ -42,8 +42,8 @@ class LocalitaDatatables(BaseDatatableView):
 
 class MultimediaDatatables(BaseDatatableView):
     model = Multimedia
-    columns = ['id', 'tipologia', 'nome', 'descrizione', 'media', 'qr_code', 'del']
-    order_columns = ['id', 'tipologia', 'nome', 'descrizione', 'media', 'qr_code', 'del']
+    columns = ['id', 'tipologia', 'nome', 'descrizione', 'testo', 'media', 'qr_code', 'del']
+    order_columns = ['id', 'tipologia', 'nome', 'descrizione', 'testo', 'media', 'qr_code', 'del']
 
     def get_initial_queryset(self):
         poi = self.request.GET.get('pk')
@@ -60,6 +60,8 @@ class MultimediaDatatables(BaseDatatableView):
             return escape('{0}'.format(row.nome))
         if column == 'descrizione':
             return escape('{0}'.format(row.descrizione))
+        if column == 'testo':
+            return escape('{0}'.format(row.testo))
         if column == 'media':
             return f'<a href="{MEDIA_URL}{row.media}" target="_blank" title="vedi" class="btn btn-sm btn-secondary"><i class="far fa-eye"></i> visualizza </a>'
         if column == 'qr_code':
diff --git a/sistema/forms.py b/sistema/forms.py
index c46dc52..a43e66c 100644
--- a/sistema/forms.py
+++ b/sistema/forms.py
@@ -39,16 +39,17 @@ class LocalitaForm(forms.ModelForm):
 
 
 class TipoMultimediaForm(forms.ModelForm):
-    class Meta:
-        model = TipologiaMultimedia
-        exclude = ('is_active',)
-
     nome = forms.CharField(
         label="Nome tipologia",
-        max_length=255,
-        widget=forms.TextInput(attrs={'class': 'form-control', 'form': 'tipo_multimedia_form'})
+        widget=forms.TextInput(attrs={'class': 'form-control'})
     )
 
+    class Meta:
+        model = TipologiaMultimedia
+        exclude = ('is_active',)
+
+    def __init__(self, *args, **kwargs):
+        super(TipoMultimediaForm, self).__init__(*args, **kwargs)
 
 class PoiForm(forms.ModelForm):
     anteprima_poi = forms.FileField(label='Anteprima POI', widget=forms.FileInput(
diff --git a/sistema/templates/add_mod_poi.html b/sistema/templates/add_mod_poi.html
index 3d3fd74..44c12fe 100644
--- a/sistema/templates/add_mod_poi.html
+++ b/sistema/templates/add_mod_poi.html
@@ -69,6 +69,7 @@
                                         <th>Tipologia</th>
                                         <th>Nome</th>
                                         <th>Descrizione</th>
+                                        <th>Testo</th>
                                         <th>Media</th>
                                         <th>QRcode</th>
                                         <th></th>
@@ -149,8 +150,8 @@
                         url: "//cdn.datatables.net/plug-ins/1.10.20/i18n/Italian.json"
                     },
                     columnDefs: [
-                        {"targets": 5, "orderable": false, "width": "8%"},
-                        {"targets": 6, "orderable": false, "width": "5%"},
+                        {"targets": 6, "orderable": false, "width": "8%"},
+                        {"targets": 7, "orderable": false, "width": "5%"},
                     ],
                     "order": []
                 });
-- 
2.43.0