From cafd91ea6deb72b2d26ad274a0a20806e114c5d5 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Mon, 16 Aug 2010 10:18:50 +0200 Subject: [PATCH] Aggiunta ricerca vie. --- data/organigramma/gui/organigramma.gui | 161 +++++++++++++ docs/organigramma.sql | 72 ++++-- src/Makefile.am | 4 +- src/vie.c | 322 +++++++++++++++++++++++++ src/vie.h | 65 +++++ 5 files changed, 598 insertions(+), 26 deletions(-) create mode 100644 src/vie.c create mode 100644 src/vie.h diff --git a/data/organigramma/gui/organigramma.gui b/data/organigramma/gui/organigramma.gui index c83ae2e..f13b0ca 100644 --- a/data/organigramma/gui/organigramma.gui +++ b/data/organigramma/gui/organigramma.gui @@ -476,6 +476,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + True center-on-parent @@ -1452,6 +1480,29 @@ True True + lstore_ufficio_recapiti + + + Tipo + + + + 0 + + + + + + + Recapito + + + + 2 + + + + @@ -1553,6 +1604,29 @@ True True + lstore_ufficio_nodi + + + Tipo + + + + 0 + + + + + + + Nodo + + + + 2 + + + + @@ -2382,4 +2456,91 @@ + + Vie - Gestione organigramma + True + center-on-parent + 500 + 400 + True + + + True + 5 + vertical + 5 + + + True + True + automatic + automatic + etched-in + + + True + True + lstore_vie + False + 1 + + + Nome + + + + 1 + + + + + + + + + 0 + + + + + True + 5 + end + + + gtk-cancel + True + True + True + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + True + + + False + False + 1 + + + + + False + 1 + + + + + diff --git a/docs/organigramma.sql b/docs/organigramma.sql index 52fcd3a..3f01493 100644 --- a/docs/organigramma.sql +++ b/docs/organigramma.sql @@ -2,7 +2,7 @@ -- PostgreSQL database dump -- --- Started on 2010-08-16 09:14:37 +-- Started on 2010-08-16 10:18:29 SET statement_timeout = 0; SET client_encoding = 'UTF8'; @@ -12,7 +12,7 @@ SET client_min_messages = warning; SET escape_string_warning = off; -- --- TOC entry 1811 (class 1262 OID 59278) +-- TOC entry 1817 (class 1262 OID 59278) -- Name: organigramma; Type: DATABASE; Schema: -; Owner: - -- @@ -29,7 +29,7 @@ SET client_min_messages = warning; SET escape_string_warning = off; -- --- TOC entry 315 (class 2612 OID 16386) +-- TOC entry 317 (class 2612 OID 16386) -- Name: plpgsql; Type: PROCEDURAL LANGUAGE; Schema: -; Owner: - -- @@ -43,8 +43,8 @@ SET default_tablespace = ''; SET default_with_oids = false; -- --- TOC entry 1502 (class 1259 OID 59279) --- Dependencies: 1784 1785 1786 3 +-- TOC entry 1504 (class 1259 OID 59279) +-- Dependencies: 1787 1788 1789 3 -- Name: nodi; Type: TABLE; Schema: public; Owner: -; Tablespace: -- @@ -59,8 +59,8 @@ CREATE TABLE nodi ( -- --- TOC entry 1506 (class 1259 OID 59327) --- Dependencies: 1794 1795 1796 1797 1798 3 +-- TOC entry 1508 (class 1259 OID 59327) +-- Dependencies: 1797 1798 1799 1800 1801 3 -- Name: strutture; Type: TABLE; Schema: public; Owner: -; Tablespace: -- @@ -75,8 +75,8 @@ CREATE TABLE strutture ( -- --- TOC entry 1503 (class 1259 OID 59290) --- Dependencies: 1787 1788 3 +-- TOC entry 1505 (class 1259 OID 59290) +-- Dependencies: 1790 1791 3 -- Name: tipi_nodo; Type: TABLE; Schema: public; Owner: -; Tablespace: -- @@ -88,8 +88,8 @@ CREATE TABLE tipi_nodo ( -- --- TOC entry 1504 (class 1259 OID 59297) --- Dependencies: 1789 1790 3 +-- TOC entry 1506 (class 1259 OID 59297) +-- Dependencies: 1792 1793 3 -- Name: tipi_recapito; Type: TABLE; Schema: public; Owner: -; Tablespace: -- @@ -101,8 +101,8 @@ CREATE TABLE tipi_recapito ( -- --- TOC entry 1505 (class 1259 OID 59311) --- Dependencies: 1791 1792 1793 3 +-- TOC entry 1507 (class 1259 OID 59311) +-- Dependencies: 1794 1795 1796 3 -- Name: uffici; Type: TABLE; Schema: public; Owner: -; Tablespace: -- @@ -116,8 +116,20 @@ CREATE TABLE uffici ( -- --- TOC entry 1800 (class 2606 OID 59289) --- Dependencies: 1502 1502 +-- TOC entry 1509 (class 1259 OID 59340) +-- Dependencies: 1802 3 +-- Name: vie; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- + +CREATE TABLE vie ( + id integer NOT NULL, + nome character varying(100) DEFAULT ''::character varying +); + + +-- +-- TOC entry 1804 (class 2606 OID 59289) +-- Dependencies: 1504 1504 -- Name: nodi_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: -- @@ -126,8 +138,8 @@ ALTER TABLE ONLY nodi -- --- TOC entry 1808 (class 2606 OID 59339) --- Dependencies: 1506 1506 +-- TOC entry 1812 (class 2606 OID 59339) +-- Dependencies: 1508 1508 -- Name: strutture_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: -- @@ -136,8 +148,8 @@ ALTER TABLE ONLY strutture -- --- TOC entry 1802 (class 2606 OID 59296) --- Dependencies: 1503 1503 +-- TOC entry 1806 (class 2606 OID 59296) +-- Dependencies: 1505 1505 -- Name: tipi_nodo_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: -- @@ -146,8 +158,8 @@ ALTER TABLE ONLY tipi_nodo -- --- TOC entry 1804 (class 2606 OID 59303) --- Dependencies: 1504 1504 +-- TOC entry 1808 (class 2606 OID 59303) +-- Dependencies: 1506 1506 -- Name: tipi_recapito_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: -- @@ -156,8 +168,8 @@ ALTER TABLE ONLY tipi_recapito -- --- TOC entry 1806 (class 2606 OID 59321) --- Dependencies: 1505 1505 +-- TOC entry 1810 (class 2606 OID 59321) +-- Dependencies: 1507 1507 -- Name: uffici_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: -- @@ -166,7 +178,17 @@ ALTER TABLE ONLY uffici -- --- TOC entry 1813 (class 0 OID 0) +-- TOC entry 1814 (class 2606 OID 59345) +-- Dependencies: 1509 1509 +-- Name: vie_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- + +ALTER TABLE ONLY vie + ADD CONSTRAINT vie_pkey PRIMARY KEY (id); + + +-- +-- TOC entry 1819 (class 0 OID 0) -- Dependencies: 3 -- Name: public; Type: ACL; Schema: -; Owner: - -- @@ -177,7 +199,7 @@ GRANT ALL ON SCHEMA public TO postgres; GRANT ALL ON SCHEMA public TO PUBLIC; --- Completed on 2010-08-16 09:14:37 +-- Completed on 2010-08-16 10:18:29 -- -- PostgreSQL database dump complete diff --git a/src/Makefile.am b/src/Makefile.am index 63f521b..b9f55d7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,4 +32,6 @@ organigramma_SOURCES = \ uffici.c \ uffici.h \ ufficio.c \ - ufficio.h \ No newline at end of file + ufficio.h \ + vie.c \ + vie.h \ No newline at end of file diff --git a/src/vie.c b/src/vie.c new file mode 100644 index 0000000..9b0cb7f --- /dev/null +++ b/src/vie.c @@ -0,0 +1,322 @@ +/* + * Copyright (C) 2010 Andrea Zagli + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifdef HAVE_CONFIG_H + #include +#endif + +#include + +#include "vie.h" + +static void vie_class_init (VieClass *klass); +static void vie_init (Vie *vie); + +static void vie_carica (Vie *vie); + +static void vie_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec); +static void vie_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec); + +#define VIE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_VIE, ViePrivate)) + + +static void vie_on_btn_annulla_clicked (GtkButton *button, + gpointer user_data); +static void vie_on_btn_seleziona_clicked (GtkButton *button, + gpointer user_data); +static void vie_on_trv_vie_row_activated (GtkTreeView *tree_view, + GtkTreePath *tree_path, + GtkTreeViewColumn *column, + gpointer user_data); + +static gboolean search_func (GtkTreeModel *model, + gint column, + const gchar *key, + GtkTreeIter *iter, + gpointer search_data); + +enum +{ + COL_ID, + COL_NOME, + COLS +}; + +typedef struct _ViePrivate ViePrivate; +struct _ViePrivate + { + Commons *commons; + + GtkWidget *w; + GtkWidget *trv_vie; + + GtkListStore *lstore_vie; + GtkTreeSelection *selection; + }; + +G_DEFINE_TYPE (Vie, vie, G_TYPE_OBJECT) + +static void +vie_class_init (VieClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (object_class, sizeof (ViePrivate)); + + object_class->set_property = vie_set_property; + object_class->get_property = vie_get_property; + + /** + * Vie::selezionato: + * @vie: + * + */ + klass->selezionato_signal_id = g_signal_new ("selezionato", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + 0, + NULL, + NULL, + g_cclosure_marshal_VOID__UINT, + G_TYPE_NONE, + 1, G_TYPE_UINT); +} + +static void +vie_init (Vie *vie) +{ + ViePrivate *priv = VIE_GET_PRIVATE (vie); +} + +/** + * vie_new: + * @commons: + * + * Returns: the newly created #Vie object. + */ +Vie +*vie_new (Commons *commons) +{ + GError *error; + + Vie *a = VIE (g_object_new (vie_get_type (), NULL)); + + ViePrivate *priv = VIE_GET_PRIVATE (a); + + priv->commons = commons; + + error = NULL; + + gtk_builder_add_objects_from_file (priv->commons->gtkbuilder, priv->commons->guifile, + g_strsplit (g_strconcat ("lstore_vie|w_vie", + NULL), "|", -1), + &error); + if (error != NULL) + { + g_fprintf (stderr, "Errore: %s\n", error->message); + return NULL; + } + + priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_vie")); + priv->trv_vie = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview8")); + priv->lstore_vie = GTK_LIST_STORE (gtk_builder_get_object (priv->commons->gtkbuilder, "lstore_vie")); + priv->selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->trv_vie)); + + g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button52")), + "clicked", G_CALLBACK (vie_on_btn_annulla_clicked), (gpointer)a); + g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button53")), + "clicked", G_CALLBACK (vie_on_btn_seleziona_clicked), (gpointer)a); + g_signal_connect (G_OBJECT (priv->trv_vie), + "row-activated", G_CALLBACK (vie_on_trv_vie_row_activated), (gpointer)a); + + gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (priv->trv_vie), search_func, NULL, NULL); + + vie_carica (a); + + return a; +} + +/** + * vie_get_widget: + * @vie: + * + */ +GtkWidget +*vie_get_widget (Vie *vie) +{ + ViePrivate *priv = VIE_GET_PRIVATE (vie); + + return priv->w; +} + +/** + * vie_carica: + * @vie: + * + */ +static void +vie_carica (Vie *vie) +{ + GError *error; + GtkTreeIter iter; + GdaDataModel *dm; + + gchar *sql; + gint rows; + gint row; + + ViePrivate *priv = VIE_GET_PRIVATE (vie); + + gtk_list_store_clear (priv->lstore_vie); + + error = NULL; + sql = g_strdup_printf ("SELECT v.id, v.nome FROM vie v" + " ORDER BY v.nome"); + dm = gdaex_query (priv->commons->gdaex, sql); + + if (dm != NULL) + { + rows = gda_data_model_get_n_rows (dm); + for (row = 0; row < rows; row++) + { + gtk_list_store_append (priv->lstore_vie, &iter); + + gtk_list_store_set (priv->lstore_vie, &iter, + COL_ID, gdaex_data_model_get_value_integer_at (dm, row, 0), + COL_NOME, gdaex_data_model_get_value_stringify_at (dm, row, 1), + -1); + } + + g_object_unref (dm); + } +} + +/* PRIVATE */ +static void +vie_seleziona (Vie *vie) +{ + GtkTreeIter iter; + guint id; + + VieClass *klass = VIE_GET_CLASS (vie); + ViePrivate *priv = VIE_GET_PRIVATE (vie); + + if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter)) + { + gtk_tree_model_get (GTK_TREE_MODEL (priv->lstore_vie), &iter, + 0, &id, + -1); + + g_signal_emit (vie, klass->selezionato_signal_id, 0, id); + + gtk_widget_destroy (priv->w); + g_object_unref (vie); + } + else + { + GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (priv->w), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, + "Occorre prima selezionare una via"); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + } +} + +static void +vie_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) +{ + Vie *vie = VIE (object); + + ViePrivate *priv = VIE_GET_PRIVATE (vie); + + switch (property_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static void +vie_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) +{ + Vie *vie = VIE (object); + + ViePrivate *priv = VIE_GET_PRIVATE (vie); + + switch (property_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +/* CALLBACK */ +static void +vie_on_btn_annulla_clicked (GtkButton *button, + gpointer user_data) +{ + ViePrivate *priv = VIE_GET_PRIVATE ((Vie *)user_data); + + gtk_widget_destroy (priv->w); + g_object_unref (user_data); +} + +static void +vie_on_btn_seleziona_clicked (GtkButton *button, + gpointer user_data) +{ + vie_seleziona ((Vie *)user_data); +} + +static void +vie_on_trv_vie_row_activated (GtkTreeView *tree_view, + GtkTreePath *tree_path, + GtkTreeViewColumn *column, + gpointer user_data) +{ + vie_seleziona ((Vie *)user_data); +} + +static gboolean +search_func (GtkTreeModel *model, + gint column, + const gchar *key, + GtkTreeIter *iter, + gpointer search_data) +{ + gchar *str; + char *ret; + + ret = NULL; + + gtk_tree_model_get (model, iter, column, &str, -1); + ret = strstr ((const char *)g_utf8_strdown (str, -1), (const char *)g_utf8_strdown (key, -1)); + + return (ret == NULL); +} diff --git a/src/vie.h b/src/vie.h new file mode 100644 index 0000000..dd6a99e --- /dev/null +++ b/src/vie.h @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2009 Andrea Zagli + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifndef __VIE_H__ +#define __VIE_H__ + +#include +#include + +#include + +#include "commons.h" + +G_BEGIN_DECLS + + +#define TYPE_VIE (vie_get_type ()) +#define VIE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIE, Vie)) +#define VIE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_VIE, VieClass)) +#define IS_VIE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_VIE)) +#define IS_VIE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_VIE)) +#define VIE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_VIE, VieClass)) + + +typedef struct _Vie Vie; +typedef struct _VieClass VieClass; + +struct _Vie + { + GObject parent; + }; + +struct _VieClass + { + GObjectClass parent_class; + + guint selezionato_signal_id; + }; + +GType vie_get_type (void) G_GNUC_CONST; + +Vie *vie_new (Commons *commons); + +GtkWidget *vie_get_widget (Vie *vie); + + +G_END_DECLS + +#endif /* __VIE_H__ */ -- 2.49.0