From 631bc357f92629815859302e52b69a075b809b5d Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Wed, 14 Dec 2016 16:03:13 +0100 Subject: [PATCH] Migrazione a libzakform di persona nodo. --- data/organigramma/form/persona_nodo.form | 93 +++++++++++------------- data/organigramma/gui/organigramma.gui | 2 +- src/personanodo.c | 87 ++++++++++++++++------ 3 files changed, 110 insertions(+), 72 deletions(-) diff --git a/data/organigramma/form/persona_nodo.form b/data/organigramma/form/persona_nodo.form index 63f196e..cfe5746 100644 --- a/data/organigramma/form/persona_nodo.form +++ b/data/organigramma/form/persona_nodo.form @@ -1,50 +1,45 @@ - - - persona_nodi
- - - - t - t - - - - - - - - - - - - SELECT a.nome - FROM nodi AS a - WHERE a.id = ##key0::gint - - - - t - - - - - - date - %d/%m/%Y - t - - - - - - date - %d/%m/%Y - - - - - - - - + + + id + integer + TRUE + label116 + + + id_persone + integer + label117 + + + id_nodi + integer + + zakgtkdecoder15 + 0 + + + da_data + datetime + + entry31 + %d/%m/%Y + + %d/%m/%Y + + + a_data + datetime + + entry32 + %d/%m/%Y + %d/%m/%Y + + + note + string + + textview12 + + + diff --git a/data/organigramma/gui/organigramma.gui b/data/organigramma/gui/organigramma.gui index 1f30c99..ca927dd 100644 --- a/data/organigramma/gui/organigramma.gui +++ b/data/organigramma/gui/organigramma.gui @@ -5193,7 +5193,7 @@ - + True False diff --git a/src/personanodo.c b/src/personanodo.c index e340d45..4bd9b4d 100644 --- a/src/personanodo.c +++ b/src/personanodo.c @@ -24,8 +24,11 @@ #include #include -#include -#include +#include +#include +#include +#include +#include #include #include "personanodo.h" @@ -41,6 +44,7 @@ static gboolean organigramma_persona_nodo_conferma_chiusura (OrganigrammaPersona static void organigramma_persona_nodo_on_nodo_selezionato (gpointer instance, guint id, gpointer user_data); +static gchar *organigramma_persona_nodo_on_nodo_decode (gpointer instance, gchar *key, gpointer user_data); static void organigramma_persona_nodo_set_property (GObject *object, guint property_id, @@ -78,7 +82,8 @@ struct _OrganigrammaPersonaNodoPrivate { OrganigrammaCommons *commons; - GtkForm *form; + ZakFormGtkForm *form; + ZakFormGdaexProvider *form_provider; GtkWidget *w; @@ -152,13 +157,15 @@ OrganigrammaPersonaNodo return NULL; } - priv->form = gtk_form_new (); - g_object_set (G_OBJECT (priv->form), "gdaex", priv->commons->gdaex, NULL); - gtk_form_load_from_file (priv->form, g_build_filename (priv->commons->formdir, "persona_nodo.form", NULL), priv->commons->gtkbuilder); + priv->form = zak_form_gtk_form_new (); + zak_form_gtk_form_set_gtkbuilder (priv->form, priv->commons->gtkbuilder); + zak_form_form_load_from_file (ZAK_FORM_FORM (priv->form), g_build_filename (priv->commons->formdir, "persona_nodo.form", NULL)); + + priv->form_provider = zak_form_gdaex_provider_new (priv->commons->gdaex, "persona_nodi"); priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_persona_nodo")); - priv->objects = gtk_form_get_objects_by_name (priv->form, + priv->objects = zak_form_gtk_form_get_gobjects_by_name (priv->form, "label116", "label117", NULL); @@ -166,8 +173,10 @@ OrganigrammaPersonaNodo g_signal_connect (priv->w, "delete-event", G_CALLBACK (organigramma_persona_nodo_on_w_organigramma_persona_nodo_delete_event), (gpointer)a); - g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "gtkformdecoder12")), + g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "zakgtkdecoder15")), "btn-browse-clicked", G_CALLBACK (organigramma_persona_nodo_on_btn_nodo_clicked), (gpointer)a); + g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "zakgtkdecoder15"), + "decode", G_CALLBACK (organigramma_persona_nodo_on_nodo_decode), (gpointer)a); g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button91")), "clicked", G_CALLBACK (organigramma_persona_nodo_on_btn_annulla_clicked), (gpointer)a); @@ -176,7 +185,7 @@ OrganigrammaPersonaNodo g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button159")), "clicked", G_CALLBACK (organigramma_persona_nodo_on_btn_salvaechiudi_clicked), (gpointer)a); - gtk_form_clear (priv->form); + zak_form_form_clear (ZAK_FORM_FORM (priv->form)); priv->id = id; if (priv->id == 0) @@ -184,7 +193,7 @@ OrganigrammaPersonaNodo gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID]), ""); gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID_PERSONE]), g_strdup_printf ("%d", id_persone)); - gtk_form_set_as_origin (priv->form); + zak_form_form_set_as_original (ZAK_FORM_FORM (priv->form)); } else { @@ -220,12 +229,9 @@ GtkWidget static void organigramma_persona_nodo_carica (OrganigrammaPersonaNodo *organigramma_persona_nodo) { - gchar *sql; - GdaDataModel *dm; - OrganigrammaPersonaNodoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_GET_PRIVATE (organigramma_persona_nodo); - if (gtk_form_fill_from_table (priv->form)) + if (zak_form_form_load (ZAK_FORM_FORM (priv->form), ZAK_FORM_IPROVIDER (priv->form_provider))) { } } @@ -233,27 +239,38 @@ organigramma_persona_nodo_carica (OrganigrammaPersonaNodo *organigramma_persona_ static void organigramma_persona_nodo_salva (OrganigrammaPersonaNodo *organigramma_persona_nodo, gboolean chiudi) { - gchar *sql; + gboolean success; OrganigrammaPersonaNodoClass *klass = ORGANIGRAMMA_PERSONA_NODO_GET_CLASS (organigramma_persona_nodo); OrganigrammaPersonaNodoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_GET_PRIVATE (organigramma_persona_nodo); - if (!gtk_form_check (priv->form, FALSE, NULL, TRUE, priv->w, TRUE)) + if (!zak_form_gtk_form_is_valid (priv->form, priv->w)) { return; } + success = FALSE; + if (priv->id == 0) { - sql = gtk_form_get_sql (priv->form, GTK_FORM_SQL_INSERT); + guint new_id; + + new_id = gdaex_get_new_id (priv->commons->gdaex, + "persona_nodi", + "id", + NULL); + + gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID]), g_strdup_printf ("%d", new_id)); + + success = zak_form_form_insert (ZAK_FORM_FORM (priv->form), ZAK_FORM_IPROVIDER (priv->form_provider)); } else { - sql = gtk_form_get_sql (priv->form, GTK_FORM_SQL_UPDATE); + success = zak_form_form_update (ZAK_FORM_FORM (priv->form), ZAK_FORM_IPROVIDER (priv->form_provider)); } - if (gdaex_execute (priv->commons->gdaex, sql) == 1) + if (success) { g_signal_emit (organigramma_persona_nodo, klass->aggiornato_signal_id, 0); @@ -262,7 +279,7 @@ organigramma_persona_nodo_salva (OrganigrammaPersonaNodo *organigramma_persona_n priv->id = strtol (gtk_label_get_text (GTK_LABEL (priv->objects[LBL_ID])), NULL, 10); } - gtk_form_set_as_origin (priv->form); + zak_form_form_set_as_original (ZAK_FORM_FORM (priv->form)); solipa_message_dialog (priv->w, GTK_MESSAGE_INFO, @@ -291,10 +308,36 @@ organigramma_persona_nodo_on_nodo_selezionato (gpointer instance, guint id, gpoi OrganigrammaPersonaNodoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_GET_PRIVATE (ia); - gtk_form_widget_set_value_stringify (gtk_form_get_form_widget_from_name (priv->form, "gtkformdecoder12"), + zak_gtk_decoder_set_key (ZAK_GTK_DECODER (gtk_builder_get_object (priv->commons->gtkbuilder, "zakgtkdecoder15")), g_strdup_printf ("%d", id)); } +static gchar +*organigramma_persona_nodo_on_nodo_decode (gpointer instance, gchar *key, gpointer user_data) +{ + GString *ret; + gchar *sql; + GdaDataModel *dm; + + OrganigrammaPersonaNodo *f = (OrganigrammaPersonaNodo *)user_data; + OrganigrammaPersonaNodoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_GET_PRIVATE (f); + + ret = g_string_new (""); + + sql = g_strdup_printf ("SELECT nome" + " FROM nodi" + " WHERE id = %d", + strtol (key, NULL, 10)); + dm = gdaex_query (priv->commons->gdaex, sql); + g_free (sql); + if (!gdaex_data_model_is_empty (dm)) + { + g_string_append (ret, gdaex_data_model_get_value_stringify_at (dm, 0, 0)); + } + + return ret->str; +} + static void organigramma_persona_nodo_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { @@ -332,7 +375,7 @@ organigramma_persona_nodo_conferma_chiusura (OrganigrammaPersonaNodo *organigram ret = TRUE; - if (gtk_form_is_changed (priv->form)) + if (zak_form_form_is_changed (ZAK_FORM_FORM (priv->form))) { if (solipa_message_dialog (priv->w, GTK_MESSAGE_QUESTION, -- 2.49.0