From: Andrea Zagli Date: Tue, 26 Oct 2010 14:45:49 +0000 (+0200) Subject: Aggiunte decodifiche nelle maschere elenco. X-Git-Tag: gtk3~33 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=5a87329ff0b91edaa21d624cb1c7afe7c3fd65b5;p=solipa%2Fterritorio Aggiunte decodifiche nelle maschere elenco. --- diff --git a/data/territorio/gui/territorio.gui b/data/territorio/gui/territorio.gui index 5fcb62f..be7fe6c 100644 --- a/data/territorio/gui/territorio.gui +++ b/data/territorio/gui/territorio.gui @@ -250,36 +250,44 @@ - + - + - + - + - + - + + + + + - + - + + + + + @@ -288,6 +296,12 @@ + + + + + + @@ -988,6 +1002,28 @@ + + + Sigla + + + + 2 + + + + + + + Regione + + + + 3 + + + + @@ -1371,6 +1407,28 @@ + + + Provincia + + + + 2 + + + + + + + Regione + + + + 3 + + + + @@ -2300,6 +2358,39 @@ + + + Comune + + + + 2 + + + + + + + Provincia + + + + 3 + + + + + + + Regione + + + + 4 + + + + diff --git a/src/comuni.c b/src/comuni.c index f9beb33..455c0a5 100644 --- 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 e78e543..06d2b5a 100644 --- 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 f5f9c7e..9f7aba7 100644 --- 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); }