From: Andrea Zagli Date: Wed, 14 Dec 2016 16:48:01 +0000 (+0100) Subject: Migrazione a libzakform di persona nodo recapito. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=19bd0ae61477b36996fbc238b16d92caa61dde1a;p=solipa%2Forganigramma Migrazione a libzakform di persona nodo recapito. --- diff --git a/data/organigramma/form/persona_nodo_recapito.form b/data/organigramma/form/persona_nodo_recapito.form index 3418851..88cc36d 100644 --- a/data/organigramma/form/persona_nodo_recapito.form +++ b/data/organigramma/form/persona_nodo_recapito.form @@ -1,51 +1,45 @@ - - - persona_nodo_recapiti
- - - - t - t - - - - - - - - - - - - - - - - - SELECT a.nome - FROM tipi_recapito AS a - WHERE a.id = ##key0::gint - - - - t - - - - - - t - - - - - - - - - - - - - + + + id + integer + TRUE + label122 + + + id_persone + integer + label126 + + + id_nodi + integer + label123 + + + id_tipi_recapito + integer + + zakgtkdecoder16 + 0 + + + recapito + string + + entry33 + + + + note + string + + textview13 + + + privato + boolean + + checkbutton11 + + diff --git a/data/organigramma/gui/organigramma.gui b/data/organigramma/gui/organigramma.gui index ca927dd..675c747 100644 --- a/data/organigramma/gui/organigramma.gui +++ b/data/organigramma/gui/organigramma.gui @@ -5416,7 +5416,7 @@ - + True False diff --git a/src/personanodorecapito.c b/src/personanodorecapito.c index 06cca71..a57275f 100644 --- a/src/personanodorecapito.c +++ b/src/personanodorecapito.c @@ -24,8 +24,11 @@ #include #include -#include -#include +#include +#include +#include +#include +#include #include #include "personanodorecapito.h" @@ -38,6 +41,7 @@ static void organigramma_persona_nodo_recapito_carica (OrganigrammaPersonaNodoRe static void organigramma_persona_nodo_recapito_salva (OrganigrammaPersonaNodoRecapito *organigramma_persona_nodo_recapito, gboolean chiudi); static void organigramma_persona_nodo_recapito_on_tipo_recapito_selezionato (gpointer instance, guint id, gpointer user_data); +static gchar *organigramma_persona_nodo_recapito_on_tipo_recapito_decode (gpointer instance, gchar *key, gpointer user_data); static gboolean organigramma_persona_nodo_recapito_conferma_chiusura (OrganigrammaPersonaNodoRecapito *organigramma_persona_nodo_recapito); @@ -79,7 +83,8 @@ struct _OrganigrammaPersonaNodoRecapitoPrivate { OrganigrammaCommons *commons; - GtkForm *form; + ZakFormGtkForm *form; + ZakFormGdaexProvider *form_provider; GtkWidget *w; @@ -154,13 +159,15 @@ OrganigrammaPersonaNodoRecapito 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_recapito.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_recapito.form", NULL)); + + priv->form_provider = zak_form_gdaex_provider_new (priv->commons->gdaex, "persona_nodo_recapiti"); priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_persona_nodo_recapito")); - priv->objects = gtk_form_get_objects_by_name (priv->form, + priv->objects = zak_form_gtk_form_get_gobjects_by_name (priv->form, "label122", "label126", "label123", @@ -169,8 +176,10 @@ OrganigrammaPersonaNodoRecapito g_signal_connect (priv->w, "delete-event", G_CALLBACK (organigramma_persona_nodo_recapito_on_w_organigramma_persona_nodo_recapito_delete_event), (gpointer *)a); - g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "gtkformdecoder9"), + g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "zakgtkdecoder16"), "btn-browse-clicked", G_CALLBACK (organigramma_persona_nodo_recapito_on_btn_tipo_recapito_clicked), (gpointer)a); + g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "zakgtkdecoder16"), + "decode", G_CALLBACK (organigramma_persona_nodo_recapito_on_tipo_recapito_decode), (gpointer)a); g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button93")), "clicked", G_CALLBACK (organigramma_persona_nodo_recapito_on_btn_annulla_clicked), (gpointer *)a); @@ -179,7 +188,7 @@ OrganigrammaPersonaNodoRecapito g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button160")), "clicked", G_CALLBACK (organigramma_persona_nodo_recapito_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) @@ -188,7 +197,7 @@ OrganigrammaPersonaNodoRecapito gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID_PERSONE]), g_strdup_printf ("%d", id_persone)); gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID_NODI]), g_strdup_printf ("%d", id_nodi)); - gtk_form_set_as_origin (priv->form); + zak_form_form_set_as_original (ZAK_FORM_FORM (priv->form)); } else { @@ -229,7 +238,7 @@ organigramma_persona_nodo_recapito_carica (OrganigrammaPersonaNodoRecapito *orga OrganigrammaPersonaNodoRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_RECAPITO_GET_PRIVATE (organigramma_persona_nodo_recapito); - if (gtk_form_fill_from_table (priv->form)) + if (zak_form_form_load (ZAK_FORM_FORM (priv->form), ZAK_FORM_IPROVIDER (priv->form_provider))) { } } @@ -237,27 +246,38 @@ organigramma_persona_nodo_recapito_carica (OrganigrammaPersonaNodoRecapito *orga static void organigramma_persona_nodo_recapito_salva (OrganigrammaPersonaNodoRecapito *organigramma_persona_nodo_recapito, gboolean chiudi) { - gchar *sql; + gboolean success; OrganigrammaPersonaNodoRecapitoClass *klass = ORGANIGRAMMA_PERSONA_NODO_RECAPITO_GET_CLASS (organigramma_persona_nodo_recapito); OrganigrammaPersonaNodoRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_RECAPITO_GET_PRIVATE (organigramma_persona_nodo_recapito); - 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_nodo_recapiti", + "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_recapito, klass->aggiornato_signal_id, 0); @@ -325,7 +345,7 @@ organigramma_persona_nodo_recapito_conferma_chiusura (OrganigrammaPersonaNodoRec 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, @@ -346,10 +366,36 @@ organigramma_persona_nodo_recapito_on_tipo_recapito_selezionato (gpointer instan OrganigrammaPersonaNodoRecapito *f = (OrganigrammaPersonaNodoRecapito *)user_data; OrganigrammaPersonaNodoRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_RECAPITO_GET_PRIVATE (f); - gtk_form_widget_set_value_stringify (gtk_form_get_form_widget_from_name (priv->form, "gtkformdecoder9"), + zak_gtk_decoder_set_key (ZAK_GTK_DECODER (gtk_builder_get_object (priv->commons->gtkbuilder, "zakgtkdecoder16")), g_strdup_printf ("%d", id)); } +static gchar +*organigramma_persona_nodo_recapito_on_tipo_recapito_decode (gpointer instance, gchar *key, gpointer user_data) +{ + GString *ret; + gchar *sql; + GdaDataModel *dm; + + OrganigrammaPersonaNodoRecapito *f = (OrganigrammaPersonaNodoRecapito *)user_data; + OrganigrammaPersonaNodoRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_RECAPITO_GET_PRIVATE (f); + + ret = g_string_new (""); + + sql = g_strdup_printf ("SELECT nome" + " FROM tipi_recapito" + " 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 gboolean organigramma_persona_nodo_recapito_on_w_organigramma_persona_nodo_recapito_delete_event (GtkWidget *widget, GdkEvent *event,