Migrato aggregazioni_territoriali a libgdaexgrid.

diff --git a/data/territorio/form/aggregazione_territoriale.form b/data/territorio/form/aggregazione_territoriale.form
index 299ec15c920b7bfd9e33ec472cd64739c90ac4b3..dd80e65fd072de29be726fc27b230ca313f0ec5c 100644 (file)
--- a/data/territorio/form/aggregazione_territoriale.form
+++ b/data/territorio/form/aggregazione_territoriale.form
@@ -13,7 +13,7 @@
     <type>integer</type>
     <label>label34</label>
     <widget>zakgtkdecoder1</widget>
-    <validator type="zak_form_element_validator_notempty"/>
+    <validator type="zak_form_element_validator_notempty">0</validator>
   </element>
   <element type="zak_form_gtk_form_element_entry">
     <name>nome</name>

diff --git a/data/territorio/gui/territorio.gui b/data/territorio/gui/territorio.gui
index 36d35a79967ed739e6c56e82a8f31ea5b4f03990..22532ed88691d57b35a71fc23dad10ae059ffd7b 100644 (file)
--- a/data/territorio/gui/territorio.gui
+++ b/data/territorio/gui/territorio.gui
@@ -45,214 +45,6 @@
       </object>
     </child>
   </object>
-  <object class="GtkListStore" id="lstore_aggregazioni_territoriali">
-    <columns>
-      <!-- column-name id -->
-      <column type="gchararray"/>
-      <!-- column-name tipo -->
-      <column type="gchararray"/>
-      <!-- column-name nome -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkWindow" id="w_aggregazioni_territoriali">
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Aggregazioni territoriali - Territorio</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="default_width">550</property>
-    <property name="default_height">400</property>
-    <property name="destroy_with_parent">True</property>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
-    <child>
-      <object class="GtkBox" id="vbox12">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkLabel" id="label30">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">&lt;b&gt;Aggregazioni territoriali&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow6">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="shadow_type">etched-in</property>
-            <child>
-              <object class="GtkTreeView" id="treeview6">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="model">lstore_aggregazioni_territoriali</property>
-                <property name="headers_clickable">False</property>
-                <property name="rules_hint">True</property>
-                <property name="search_column">2</property>
-                <child internal-child="selection">
-                  <object class="GtkTreeSelection" id="treeview-selection1"/>
-                </child>
-                <child>
-                  <object class="GtkTreeViewColumn" id="treeviewcolumn15">
-                    <property name="title" translatable="yes">Tipo</property>
-                    <property name="clickable">True</property>
-                    <property name="reorderable">True</property>
-                    <property name="sort_column_id">1</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext16"/>
-                      <attributes>
-                        <attribute name="text">1</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkTreeViewColumn" id="treeviewcolumn6">
-                    <property name="title">Nome</property>
-                    <property name="clickable">True</property>
-                    <property name="reorderable">True</property>
-                    <property name="sort_column_id">2</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext6"/>
-                      <attributes>
-                        <attribute name="text">2</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButtonBox" id="hbuttonbox11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">5</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button43">
-                <property name="label" translatable="yes">E_sporta</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button36">
-                <property name="label">gtk-new</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button37">
-                <property name="label">gtk-edit</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button38">
-                <property name="label">gtk-delete</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button39">
-                <property name="label">gtk-cancel</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">4</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button40">
-                <property name="label">gtk-ok</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">5</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkListStore" id="lstore_tipi_aggregazione_territoriale">
-    <columns>
-      <!-- column-name id -->
-      <column type="gchararray"/>
-      <!-- column-name nome -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
   <object class="GtkListStore" id="lstore_vie">
     <columns>
       <!-- column-name id -->
@@ -665,6 +457,143 @@
       </object>
     </child>
   </object>
+  <object class="GtkWindow" id="w_aggregazioni_territoriali">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Aggregazioni territoriali - Territorio</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="default_width">550</property>
+    <property name="default_height">400</property>
+    <property name="destroy_with_parent">True</property>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
+    <child>
+      <object class="GtkBox" id="vbox12">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">5</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkLabel" id="label30">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">&lt;b&gt;Aggregazioni territoriali&lt;/b&gt;</property>
+            <property name="use_markup">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow6">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="shadow_type">etched-in</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButtonBox" id="hbuttonbox11">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">5</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="button36">
+                <property name="label">gtk-new</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button37">
+                <property name="label">gtk-edit</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button38">
+                <property name="label">gtk-delete</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button39">
+                <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button40">
+                <property name="label">gtk-ok</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">5</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
   <object class="GtkWindow" id="w_comune">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Comune - Territorio</property>

diff --git a/src/aggregazioniterritoriali.c b/src/aggregazioniterritoriali.c
index b2e1cca108bbd02da7e131c3d2023b587c64da68..7025c173cf337151d404e28305ea73e0bfdb5e91 100644 (file)
--- a/src/aggregazioniterritoriali.c
+++ b/src/aggregazioniterritoriali.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2016 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2010-2019 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,6 +19,7 @@
 
 #include <libzakautho/autho.h>
 #include <libsolipa/libsolipa.h>
+#include <libgdaexgrid/libgdaexgrid.h>
 
 #include "aggregazioniterritoriali.h"
 #include "aggregazioneterritoriale.h"
@@ -41,8 +42,6 @@ static void territorio_aggregazioni_territoriali_get_property (GObject *object,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static void territorio_aggregazioni_territoriali_on_btn_esporta_clicked (GtkButton *button,
-                      gpointer user_data);
 static void territorio_aggregazioni_territoriali_on_btn_nuovo_clicked (GtkButton *button,
                       gpointer user_data);
 static void territorio_aggregazioni_territoriali_on_btn_modifica_clicked (GtkButton *button,
@@ -74,8 +73,10 @@ struct _TerritorioAggregazioniTerritorialiPrivate
                TerritorioCommons *commons;
 
                GtkWidget *widget;
+               GdaExGrid *grid;
+               GtkWidget *wgrid;
                GtkTreeSelection *selection;
-               GtkListStore *lstore_aggregazioni_territoriali;
+               GtkTreeStore *tstore_aggregazioni_territoriali;
 
                gboolean selezione;
                GtkWindow *wtransient;
@@ -128,6 +129,8 @@ TerritorioAggregazioniTerritoriali
        GError *error;
        ZakAuthoIResource *ires1;
 
+       GdaExGridColumn *gcol;
+
        TerritorioAggregazioniTerritoriali *a = TERRITORIO_AGGREGAZIONI_TERRITORIALI (g_object_new (territorio_aggregazioni_territoriali_get_type (), NULL));
 
        TerritorioAggregazioniTerritorialiPrivate *priv = TERRITORIO_AGGREGAZIONI_TERRITORIALI_GET_PRIVATE (a);
@@ -149,8 +152,28 @@ TerritorioAggregazioniTerritoriali
                }
 
        priv->widget = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, (selezione ? "w_aggregazioni_territoriali" : "vbox12")));
-       priv->selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview6")));
-       priv->lstore_aggregazioni_territoriali = GTK_LIST_STORE (gtk_builder_get_object (priv->commons->gtkbuilder, "lstore_aggregazioni_territoriali"));
+
+       /* creo la gdaexgrid */
+       priv->grid = gdaex_grid_new ();
+       gdaex_grid_set_solipa (priv->grid, priv->commons->solipa);
+       gdaex_grid_set_title (priv->grid, gtk_label_get_text (GTK_LABEL (gtk_builder_get_object (priv->commons->gtkbuilder, "label30"))));
+
+       gcol = gdaex_grid_column_new ("ID", "id", G_TYPE_INT, TRUE, TRUE, TRUE, TRUE, -1);
+       gdaex_grid_add_column (priv->grid, gcol);
+
+       gcol = gdaex_grid_column_new_defaults ("Tipo", "tipo", G_TYPE_STRING);
+       gdaex_grid_add_column (priv->grid, gcol);
+
+       gcol = gdaex_grid_column_new_defaults ("Nome", "nome", G_TYPE_STRING);
+       gdaex_grid_add_column (priv->grid, gcol);
+
+       priv->wgrid = gdaex_grid_get_widget (priv->grid);
+       gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->wgrid), 1);
+       gtk_container_add (GTK_CONTAINER (gtk_builder_get_object (priv->commons->gtkbuilder, "scrolledwindow6")), priv->wgrid);
+       gtk_widget_show (priv->wgrid);
+
+       priv->selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->wgrid));
+       priv->tstore_aggregazioni_territoriali = GTK_TREE_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->wgrid)));
 
        if (priv->selezione)
                {
@@ -161,15 +184,13 @@ TerritorioAggregazioniTerritoriali
                        priv->wtransient = GTK_WINDOW (gtk_builder_get_object (priv->commons->gtkbuilder, "w_main"));
                }
 
-       g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button43"),
-                         "clicked", G_CALLBACK (territorio_aggregazioni_territoriali_on_btn_esporta_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button36"),
                          "clicked", G_CALLBACK (territorio_aggregazioni_territoriali_on_btn_nuovo_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button37"),
                          "clicked", G_CALLBACK (territorio_aggregazioni_territoriali_on_btn_modifica_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button38"),
                          "clicked", G_CALLBACK (territorio_aggregazioni_territoriali_on_btn_elimina_clicked), (gpointer)a);
-       g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview6"),
+       g_signal_connect (priv->wgrid,
                          "row-activated", G_CALLBACK (territorio_aggregazioni_territoriali_on_trv_territorio_aggregazioni_territoriali_row_activated), (gpointer)a);
 
        if (priv->selezione)
@@ -216,43 +237,30 @@ static void
 territorio_aggregazioni_territoriali_carica (TerritorioAggregazioniTerritoriali *territorio_aggregazioni_territoriali)
 {
        GtkTreeIter iter;
-       GdaDataModel *dm;
-
-       gint rows;
-       gint row;
+       gchar *sql;
 
        TerritorioAggregazioniTerritorialiPrivate *priv = TERRITORIO_AGGREGAZIONI_TERRITORIALI_GET_PRIVATE (territorio_aggregazioni_territoriali);
 
-       gtk_list_store_clear (priv->lstore_aggregazioni_territoriali);
+       gtk_tree_store_clear (priv->tstore_aggregazioni_territoriali);
 
-       dm = gdaex_query (priv->commons->gdaex,
-                         "SELECT c.id, t.nome AS tipo, c.nome"
-                         " FROM aggregazioni_territoriali AS c"
-                         " INNER JOIN tipi_aggregazione_territoriale AS t ON c.id_tipi_aggregazione_territoriale = t.id"
-                         " WHERE c.status <> 'E'"
-                         " ORDER BY t.nome, c.nome");
-       if (dm != NULL)
-               {
-                       rows = gda_data_model_get_n_rows (dm);
-                       for (row = 0; row < rows; row++)
-                               {
-                                       gtk_list_store_append (priv->lstore_aggregazioni_territoriali, &iter);
-                                       gtk_list_store_set (priv->lstore_aggregazioni_territoriali, &iter,
-                                                           COL_ID, gdaex_data_model_get_field_value_stringify_at (dm, row, "id"),
-                                                           COL_TIPO, gdaex_data_model_get_field_value_stringify_at (dm, row, "tipo"),
-                                                           COL_NOME, gdaex_data_model_get_field_value_stringify_at (dm, row, "nome"),
-                                                           -1);
-                               }
+       sql = g_strdup_printf ("SELECT c.id, t.nome AS tipo, c.nome"
+                              " FROM aggregazioni_territoriali AS c"
+                              " INNER JOIN tipi_aggregazione_territoriale AS t ON c.id_tipi_aggregazione_territoriale = t.id"
+                              " WHERE c.status <> 'E'"
+                              " ORDER BY t.nome, c.nome");
+       gdaex_grid_fill_from_sql (priv->grid,
+                                 priv->commons->gdaex,
+                                 sql,
+                                 NULL);
 
-                       g_object_unref (dm);
-               }
+       g_free (sql);
 }
 
 static void
 territorio_aggregazioni_territoriali_modifica (TerritorioAggregazioniTerritoriali *territorio_aggregazioni_territoriali)
 {
        GtkTreeIter iter;
-       gchar *id;
+       guint id;
 
        TerritorioAggregazioniTerritorialiPrivate *priv = TERRITORIO_AGGREGAZIONI_TERRITORIALI_GET_PRIVATE (territorio_aggregazioni_territoriali);
 
@@ -260,11 +268,11 @@ territorio_aggregazioni_territoriali_modifica (TerritorioAggregazioniTerritorial
                {
                        GtkWidget *w;
 
-                       gtk_tree_model_get (GTK_TREE_MODEL (priv->lstore_aggregazioni_territoriali), &iter,
+                       gtk_tree_model_get (GTK_TREE_MODEL (priv->tstore_aggregazioni_territoriali), &iter,
                                            COL_ID, &id,
                                            -1);
 
-                       TerritorioAggregazioneTerritoriale *c = territorio_aggregazione_territoriale_new (priv->commons, strtol (id, NULL, 10));
+                       TerritorioAggregazioneTerritoriale *c = territorio_aggregazione_territoriale_new (priv->commons, id);
 
                        g_signal_connect (G_OBJECT (c), "aggiornato",
                                          G_CALLBACK (territorio_aggregazioni_territoriali_on_aggregazione_territoriale_aggiornato), (gpointer)territorio_aggregazioni_territoriali);
@@ -286,18 +294,18 @@ static void
 territorio_aggregazioni_territoriali_selezionato (TerritorioAggregazioniTerritoriali *territorio_aggregazioni_territoriali)
 {
        GtkTreeIter iter;
-       gchar *id;
+       guint id;
 
        TerritorioAggregazioniTerritorialiClass *klass = TERRITORIO_AGGREGAZIONI_TERRITORIALI_GET_CLASS (territorio_aggregazioni_territoriali);
        TerritorioAggregazioniTerritorialiPrivate *priv = TERRITORIO_AGGREGAZIONI_TERRITORIALI_GET_PRIVATE (territorio_aggregazioni_territoriali);
 
        if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter))
                {
-                       gtk_tree_model_get (GTK_TREE_MODEL (priv->lstore_aggregazioni_territoriali), &iter,
+                       gtk_tree_model_get (GTK_TREE_MODEL (priv->tstore_aggregazioni_territoriali), &iter,
                                            COL_ID, &id,
                                            -1);
 
-                       g_signal_emit (G_OBJECT (territorio_aggregazioni_territoriali), klass->selezionato_signal_id, 0, strtol (id, NULL, 10));
+                       g_signal_emit (G_OBJECT (territorio_aggregazioni_territoriali), klass->selezionato_signal_id, 0, id);
 
                        gtk_widget_destroy (priv->widget);
                        g_object_unref (G_OBJECT (territorio_aggregazioni_territoriali));
@@ -346,48 +354,6 @@ territorio_aggregazioni_territoriali_get_property (GObject *object, guint proper
 }
 
 /* CALLBACK */
-static void
-territorio_aggregazioni_territoriali_on_btn_esporta_clicked (GtkButton *button,
-                      gpointer user_data)
-{
-       GtkWidget *transient;
-
-       guint ret;
-
-       TerritorioAggregazioniTerritoriali *territorio_aggregazioni_territoriali = (TerritorioAggregazioniTerritoriali *)user_data;
-       TerritorioAggregazioniTerritorialiPrivate *priv = TERRITORIO_AGGREGAZIONI_TERRITORIALI_GET_PRIVATE (territorio_aggregazioni_territoriali);
-
-       gchar **columns_title = g_strsplit ("ID|Tipo|Aggregazione", "|", -1);
-
-       if (priv->selezione)
-               {
-                       transient = priv->widget;
-               }
-       else
-               {
-                       transient = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_main"));
-               }
-
-       ret = solipa_gtktreemodel_to_csv_gui (priv->commons->solipa, GTK_WINDOW (transient), GTK_TREE_MODEL (priv->lstore_aggregazioni_territoriali),
-                                             columns_title, g_strv_length (columns_title));
-       if (ret == 1)
-               {
-                       solipa_message_dialog (transient,
-                                              GTK_MESSAGE_INFO,
-                                              GTK_BUTTONS_OK,
-                                              "Salvataggio eseguito con successo.");
-               }
-       else if (ret == 0)
-               {
-                       solipa_message_dialog (transient,
-                                              GTK_MESSAGE_WARNING,
-                                              GTK_BUTTONS_OK,
-                                              "Errore durante il salvataggio.");
-               }
-
-       g_strfreev (columns_title);
-}
-
 static void
 territorio_aggregazioni_territoriali_on_btn_nuovo_clicked (GtkButton *button,
                       gpointer user_data)
@@ -433,7 +399,7 @@ territorio_aggregazioni_territoriali_on_btn_elimina_clicked (GtkButton *button,
        ZakAuthoIResource *ires1;
 
        GtkTreeIter iter;
-       gchar *id;
+       guint id;
 
        TerritorioAggregazioniTerritoriali *territorio_aggregazioni_territoriali = (TerritorioAggregazioniTerritoriali *)user_data;
        TerritorioAggregazioniTerritorialiPrivate *priv = TERRITORIO_AGGREGAZIONI_TERRITORIALI_GET_PRIVATE (territorio_aggregazioni_territoriali);
@@ -455,12 +421,12 @@ territorio_aggregazioni_territoriali_on_btn_elimina_clicked (GtkButton *button,
                                                   GTK_BUTTONS_YES_NO,
                                                   "Sicuro di voler eliminare l'aggregazione territoriale selezionata?") == GTK_RESPONSE_YES)
                                {
-                                       gtk_tree_model_get (GTK_TREE_MODEL (priv->lstore_aggregazioni_territoriali), &iter,
+                                       gtk_tree_model_get (GTK_TREE_MODEL (priv->tstore_aggregazioni_territoriali), &iter,
                                                            COL_ID, &id,
                                                            -1);
 
                                        gdaex_execute (priv->commons->gdaex,
-                                                      g_strdup_printf ("UPDATE aggregazioni_territoriali SET status = 'E' WHERE id = %s", id));
+                                                      g_strdup_printf ("UPDATE aggregazioni_territoriali SET status = 'E' WHERE id = %d", id));
 
                                        territorio_aggregazioni_territoriali_carica (territorio_aggregazioni_territoriali);
                                }