Aggiunte decodifiche nelle maschere elenco.

diff --git a/data/territorio/gui/territorio.gui b/data/territorio/gui/territorio.gui
index 5fcb62fb137f21675c6302583da451deb90b83c6..be7fe6c5bfc9b30755d7a13f83b737ad0ff8b67a 100644 (file)
--- a/data/territorio/gui/territorio.gui
+++ b/data/territorio/gui/territorio.gui
@@ -250,36 +250,44 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="lstore_province">
+  <object class="GtkListStore" id="lstore_tipi_aggregazione_territoriale">
     <columns>
       <!-- column-name id -->
-      <column type="guint"/>
+      <column type="gchararray"/>
       <!-- column-name nome -->
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="lstore_comuni">
+  <object class="GtkListStore" id="lstore_aggregazioni_territoriali">
     <columns>
       <!-- column-name id -->
-      <column type="guint"/>
+      <column type="gchararray"/>
       <!-- column-name nome -->
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="lstore_tipi_aggregazione_territoriale">
+  <object class="GtkListStore" id="lstore_comuni">
     <columns>
       <!-- column-name id -->
-      <column type="gchararray"/>
+      <column type="guint"/>
       <!-- column-name nome -->
       <column type="gchararray"/>
+      <!-- column-name provincia -->
+      <column type="gchararray"/>
+      <!-- column-name regione -->
+      <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="lstore_aggregazioni_territoriali">
+  <object class="GtkListStore" id="lstore_province">
     <columns>
       <!-- column-name id -->
-      <column type="gchararray"/>
+      <column type="guint"/>
       <!-- column-name nome -->
       <column type="gchararray"/>
+      <!-- column-name sigla -->
+      <column type="gchararray"/>
+      <!-- column-name regione -->
+      <column type="gchararray"/>
     </columns>
   </object>
   <object class="GtkListStore" id="lstore_vie">
@@ -288,6 +296,12 @@
       <column type="guint"/>
       <!-- column-name nome -->
       <column type="gchararray"/>
+      <!-- column-name comune -->
+      <column type="gchararray"/>
+      <!-- column-name provincia -->
+      <column type="gchararray"/>
+      <!-- column-name regione -->
+      <column type="gchararray"/>
     </columns>
   </object>
   <object class="GtkWindow" id="w_stati">
@@ -988,6 +1002,28 @@
                     </child>
                   </object>
                 </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn11">
+                    <property name="title">Sigla</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext12"/>
+                      <attributes>
+                        <attribute name="text">2</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn8">
+                    <property name="title">Regione</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext9"/>
+                      <attributes>
+                        <attribute name="text">3</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
               </object>
             </child>
           </object>
@@ -1371,6 +1407,28 @@
                     </child>
                   </object>
                 </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn9">
+                    <property name="title">Provincia</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext10"/>
+                      <attributes>
+                        <attribute name="text">2</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn10">
+                    <property name="title">Regione</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext11"/>
+                      <attributes>
+                        <attribute name="text">3</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
               </object>
             </child>
           </object>
@@ -2300,6 +2358,39 @@
                     </child>
                   </object>
                 </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn12">
+                    <property name="title">Comune</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext13"/>
+                      <attributes>
+                        <attribute name="text">2</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn13">
+                    <property name="title">Provincia</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext14"/>
+                      <attributes>
+                        <attribute name="text">3</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn14">
+                    <property name="title">Regione</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext15"/>
+                      <attributes>
+                        <attribute name="text">4</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
               </object>
             </child>
           </object>

diff --git a/src/comuni.c b/src/comuni.c
index f9beb33f915c3cdaa5c6acb674871312c84678ef..455c0a5426ffbb734fd34dfdea6d2efc6cb6ac87 100644 (file)
--- a/src/comuni.c
+++ b/src/comuni.c
@@ -65,7 +65,9 @@ static void territorio_comuni_on_btn_seleziona_clicked (GtkButton *button,
 enum
 {
        COL_ID,
-       COL_NOME
+       COL_NOME,
+       COL_PROVINCIA,
+       COL_REGIONE
 };
 
 typedef struct _TerritorioComuniPrivate TerritorioComuniPrivate;
@@ -245,8 +247,12 @@ territorio_comuni_carica (TerritorioComuni *territorio_comuni)
                                }
                }
 
-       sql = g_strdup_printf ("SELECT c.id, c.nome"
+       sql = g_strdup_printf ("SELECT c.id, c.nome,"
+                              " p.nome || ' (' || p.sigla || ')' AS provincia,"
+                              " r.nome AS regione"
                               " FROM comuni AS c"
+                              " INNER JOIN province AS p ON c.id_province = p.id"
+                              " INNER JOIN regioni AS r ON p.id_regioni = r.id"
                               " WHERE c.status <> 'E'"
                               "%s"
                               " ORDER BY c.nome",
@@ -262,6 +268,8 @@ territorio_comuni_carica (TerritorioComuni *territorio_comuni)
                                        gtk_list_store_set (priv->lstore_comuni, &iter,
                                                            COL_ID, gdaex_data_model_get_field_value_integer_at (dm, row, "id"),
                                                            COL_NOME, gdaex_data_model_get_field_value_stringify_at (dm, row, "nome"),
+                                                           COL_PROVINCIA, gdaex_data_model_get_field_value_stringify_at (dm, row, "provincia"),
+                                                           COL_REGIONE, gdaex_data_model_get_field_value_stringify_at (dm, row, "regione"),
                                                            -1);
                                }
 

diff --git a/src/province.c b/src/province.c
index e78e5433ad0f167ce7f976a2939c630e71a1afb1..06d2b5a2ad4389bc9600184a9ef578ca3fee0821 100644 (file)
--- a/src/province.c
+++ b/src/province.c
@@ -65,7 +65,9 @@ static void territorio_province_on_btn_seleziona_clicked (GtkButton *button,
 enum
 {
        COL_ID,
-       COL_NOME
+       COL_NOME,
+       COL_SIGLA,
+       COL_REGIONE
 };
 
 typedef struct _TerritorioProvincePrivate TerritorioProvincePrivate;
@@ -245,8 +247,9 @@ territorio_province_carica (TerritorioProvince *territorio_province)
                                }
                }
 
-       sql = g_strdup_printf ("SELECT c.id, c.nome"
+       sql = g_strdup_printf ("SELECT c.id, c.nome, c.sigla, r.nome AS regione"
                               " FROM province AS c"
+                              " INNER JOIN regioni AS r ON c.id_regioni = r.id"
                               " WHERE c.status <> 'E'"
                               "%s"
                               " ORDER BY c.nome",
@@ -263,6 +266,8 @@ territorio_province_carica (TerritorioProvince *territorio_province)
                                        gtk_list_store_set (priv->lstore_province, &iter,
                                                            COL_ID, gdaex_data_model_get_field_value_integer_at (dm, row, "id"),
                                                            COL_NOME, gdaex_data_model_get_field_value_stringify_at (dm, row, "nome"),
+                                                           COL_SIGLA, gdaex_data_model_get_field_value_stringify_at (dm, row, "sigla"),
+                                                           COL_REGIONE, gdaex_data_model_get_field_value_stringify_at (dm, row, "regione"),
                                                            -1);
                                }
 

diff --git a/src/vie.c b/src/vie.c
index f5f9c7e6f9ed540a7e08bedc2c50f64bd626730e..9f7aba7ba78c3a0d3868556c84b5e80961bbf0e6 100644 (file)
--- a/src/vie.c
+++ b/src/vie.c
@@ -74,7 +74,10 @@ static gboolean search_func (GtkTreeModel *model,
 enum
 {
        COL_ID,
-       COL_NOME
+       COL_NOME,
+       COL_COMUNE,
+       COL_PROVINCIA,
+       COL_REGIONE
 };
 
 typedef struct _TerritorioViePrivate TerritorioViePrivate;
@@ -242,7 +245,7 @@ territorio_vie_carica (TerritorioVie *territorio_vie)
                        gcval = g_strstrip ((gchar *)g_value_get_string ((GValue *)g_hash_table_lookup (priv->parametri_ricerca, "nome")));
                        if (g_strcmp0 (gcval, "") != 0)
                                {
-                                       sql_where = g_strconcat (sql_where, " AND c.nome ILIKE '%",
+                                       sql_where = g_strconcat (sql_where, " AND v.nome ILIKE '%",
                                                                 g_strdup_printf ("%s", gcval),
                                                                 "%'",
                                                                 NULL);
@@ -250,17 +253,23 @@ territorio_vie_carica (TerritorioVie *territorio_vie)
                        ival = g_value_get_int ((GValue *)g_hash_table_lookup (priv->parametri_ricerca, "id_comuni"));
                        if (ival != 0)
                                {
-                                       sql_where = g_strconcat (sql_where, " AND c.id_comuni = ",
+                                       sql_where = g_strconcat (sql_where, " AND v.id_comuni = ",
                                                                 g_strdup_printf ("%d", ival),
                                                                 NULL);
                                }
                }
 
-       sql = g_strdup_printf ("SELECT c.id, c.nome"
-                              " FROM vie AS c"
-                              " WHERE c.status <> 'E'"
+       sql = g_strdup_printf ("SELECT v.id, v.nome,"
+                              " c.nome AS comune,"
+                              " p.nome || ' (' || p.sigla || ')' AS provincia,"
+                              " r.nome AS regione"
+                              " FROM vie AS v"
+                              " INNER JOIN comuni AS c ON v.id_comuni = c.id"
+                              " INNER JOIN province AS p ON c.id_province = p.id"
+                              " INNER JOIN regioni AS r ON p.id_regioni = r.id"
+                              " WHERE v.status <> 'E'"
                               "%s"
-                              " ORDER BY c.nome",
+                              " ORDER BY v.nome",
                               sql_where);
 
        dm = gdaex_query (priv->commons->gdaex, sql);
@@ -274,6 +283,9 @@ territorio_vie_carica (TerritorioVie *territorio_vie)
                                        gtk_list_store_set (priv->lstore_vie, &iter,
                                                            COL_ID, gdaex_data_model_get_field_value_integer_at (dm, row, "id"),
                                                            COL_NOME, gdaex_data_model_get_field_value_stringify_at (dm, row, "nome"),
+                                                           COL_COMUNE, gdaex_data_model_get_field_value_stringify_at (dm, row, "comune"),
+                                                           COL_PROVINCIA, gdaex_data_model_get_field_value_stringify_at (dm, row, "provincia"),
+                                                           COL_REGIONE, gdaex_data_model_get_field_value_stringify_at (dm, row, "regione"),
                                                            -1);
                                }