From 82beb04bb8f9f450683fa71f67319ae116df668e Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Tue, 13 Dec 2016 10:05:14 +0100 Subject: [PATCH] Migrazione a libzakform di persona recapito. --- configure.ac | 1 + data/organigramma/form/persona_recapito.form | 84 +++++++++---------- data/organigramma/gui/organigramma.gui | 83 ++++++++++--------- src/personarecapito.c | 87 +++++++++++++++----- 4 files changed, 147 insertions(+), 108 deletions(-) diff --git a/configure.ac b/configure.ac index 2176fc0..0f1fb0f 100644 --- a/configure.ac +++ b/configure.ac @@ -51,6 +51,7 @@ PKG_CHECK_MODULES(ORGANIGRAMMA, [gio-2.0 >= 2.36 libzakform libzakformgtk libzakformgdaex + libzakformgtkdecoder libzakconfi >= 0.10.0 libzakauthe >= 0.5.99 libzakautho >= 0.0.5 diff --git a/data/organigramma/form/persona_recapito.form b/data/organigramma/form/persona_recapito.form index 993b2fe..a78fee2 100644 --- a/data/organigramma/form/persona_recapito.form +++ b/data/organigramma/form/persona_recapito.form @@ -1,46 +1,40 @@ - - - persona_recapiti
- - - - t - t - - - - - - - - - - - - SELECT a.nome - FROM tipi_recapito AS a - WHERE a.id = ##key0::gint - - - - t - - - - - - t - - - - - - - - - - - - - + + + id + integer + TRUE + label103 + + + id_persone + integer + label107 + + + id_tipi_recapito + integer + + zakgtkdecoder1 + 0 + + + recapito + string + + entry25 + + + + note + string + + textview11 + + + privato + boolean + + checkbutton10 + + diff --git a/data/organigramma/gui/organigramma.gui b/data/organigramma/gui/organigramma.gui index 8b60a18..165cc60 100644 --- a/data/organigramma/gui/organigramma.gui +++ b/data/organigramma/gui/organigramma.gui @@ -3,6 +3,7 @@ + 31 1 @@ -641,7 +642,7 @@ - + @@ -2007,7 +2008,7 @@ - + @@ -2676,7 +2677,7 @@ - + @@ -3923,7 +3924,7 @@ - + @@ -4090,7 +4091,7 @@ - + @@ -4251,7 +4252,7 @@ - + @@ -4490,7 +4491,7 @@ - + @@ -4706,7 +4707,7 @@ - + @@ -5046,7 +5047,7 @@ - + @@ -5261,7 +5262,7 @@ - + @@ -5487,7 +5488,7 @@ - + @@ -5627,7 +5628,7 @@ - + True False @@ -5700,7 +5701,7 @@ - + @@ -5993,7 +5994,7 @@ - + @@ -6219,7 +6220,7 @@ - + @@ -6351,7 +6352,7 @@ - + @@ -6490,7 +6491,7 @@ - + @@ -6622,7 +6623,7 @@ - + @@ -6754,7 +6755,7 @@ - + @@ -6893,7 +6894,7 @@ - + @@ -7025,7 +7026,7 @@ - + @@ -7164,7 +7165,7 @@ - + @@ -7440,7 +7441,7 @@ - + @@ -7634,7 +7635,7 @@ - + @@ -7864,7 +7865,7 @@ - + @@ -7996,7 +7997,7 @@ - + @@ -8128,7 +8129,7 @@ - + @@ -8260,7 +8261,7 @@ - + @@ -8392,7 +8393,7 @@ - + @@ -8524,7 +8525,7 @@ - + @@ -8759,7 +8760,7 @@ - + @@ -8898,7 +8899,7 @@ - + @@ -9037,7 +9038,7 @@ - + @@ -9209,7 +9210,7 @@ - + @@ -9341,7 +9342,7 @@ - + @@ -9507,7 +9508,7 @@ - + @@ -9783,7 +9784,7 @@ - + @@ -9977,7 +9978,7 @@ - + @@ -10138,7 +10139,7 @@ - + @@ -10351,7 +10352,7 @@ - + @@ -10571,7 +10572,7 @@ - + diff --git a/src/personarecapito.c b/src/personarecapito.c index 5ecb8be..b6f37c2 100644 --- a/src/personarecapito.c +++ b/src/personarecapito.c @@ -24,8 +24,11 @@ #include #include -#include -#include +#include +#include +#include +#include +#include #include #include "personarecapito.h" @@ -38,6 +41,7 @@ static void organigramma_persona_recapito_carica (OrganigrammaPersonaRecapito *o static void organigramma_persona_recapito_salva (OrganigrammaPersonaRecapito *organigramma_persona_recapito, gboolean chiudi); static void organigramma_persona_recapito_on_tipo_recapito_selezionato (gpointer instance, guint id, gpointer user_data); +static gchar *organigramma_persona_recapito_on_tipo_recapito_decode (gpointer instance, gchar *key, gpointer user_data); static gboolean organigramma_persona_recapito_conferma_chiusura (OrganigrammaPersonaRecapito *organigramma_persona_recapito); @@ -78,7 +82,8 @@ struct _OrganigrammaPersonaRecapitoPrivate { OrganigrammaCommons *commons; - GtkForm *form; + ZakFormGtkForm *form; + ZakFormGdaexProvider *form_provider; GtkWidget *w; @@ -152,13 +157,15 @@ OrganigrammaPersonaRecapito 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_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_recapito.form", NULL)); + + priv->form_provider = zak_form_gdaex_provider_new (priv->commons->gdaex, "persona_recapiti"); priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_persona_recapito")); - priv->objects = gtk_form_get_objects_by_name (priv->form, + priv->objects = zak_form_gtk_form_get_gobjects_by_name (priv->form, "label103", "label107", NULL); @@ -166,8 +173,10 @@ OrganigrammaPersonaRecapito g_signal_connect (priv->w, "delete-event", G_CALLBACK (organigramma_persona_recapito_on_w_organigramma_persona_recapito_delete_event), (gpointer)a); - g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "gtkformdecoder10"), + g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "zakgtkdecoder1"), "btn-browse-clicked", G_CALLBACK (organigramma_persona_recapito_on_btn_tipo_recapito_clicked), (gpointer)a); + g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "zakgtkdecoder1"), + "decode", G_CALLBACK (organigramma_persona_recapito_on_tipo_recapito_decode), (gpointer)a); g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button87")), "clicked", G_CALLBACK (organigramma_persona_recapito_on_btn_annulla_clicked), (gpointer)a); @@ -176,7 +185,7 @@ OrganigrammaPersonaRecapito g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button163")), "clicked", G_CALLBACK (organigramma_persona_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) @@ -184,7 +193,7 @@ OrganigrammaPersonaRecapito 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_recapito_carica (OrganigrammaPersonaRecapito *organigramma_persona_recapito) { - gchar *sql; - GdaDataModel *dm; - OrganigrammaPersonaRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_RECAPITO_GET_PRIVATE (organigramma_persona_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))) { } } @@ -233,27 +239,38 @@ organigramma_persona_recapito_carica (OrganigrammaPersonaRecapito *organigramma_ static void organigramma_persona_recapito_salva (OrganigrammaPersonaRecapito *organigramma_persona_recapito, gboolean chiudi) { - gchar *sql; + gboolean success; OrganigrammaPersonaRecapitoClass *klass = ORGANIGRAMMA_PERSONA_RECAPITO_GET_CLASS (organigramma_persona_recapito); OrganigrammaPersonaRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_RECAPITO_GET_PRIVATE (organigramma_persona_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_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_recapito, klass->aggiornato_signal_id, 0); @@ -262,7 +279,7 @@ organigramma_persona_recapito_salva (OrganigrammaPersonaRecapito *organigramma_p 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, @@ -321,7 +338,7 @@ organigramma_persona_recapito_conferma_chiusura (OrganigrammaPersonaRecapito *or 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, @@ -342,10 +359,36 @@ organigramma_persona_recapito_on_tipo_recapito_selezionato (gpointer instance, g OrganigrammaPersonaRecapito *f = (OrganigrammaPersonaRecapito *)user_data; OrganigrammaPersonaRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_RECAPITO_GET_PRIVATE (f); - gtk_form_widget_set_value_stringify (gtk_form_get_form_widget_from_name (priv->form, "gtkformdecoder10"), + zak_gtk_decoder_set_key (ZAK_GTK_DECODER (gtk_builder_get_object (priv->commons->gtkbuilder, "zakgtkdecoder1")), g_strdup_printf ("%d", id)); } +static gchar +*organigramma_persona_recapito_on_tipo_recapito_decode (gpointer instance, gchar *key, gpointer user_data) +{ + GString *ret; + gchar *sql; + GdaDataModel *dm; + + OrganigrammaPersonaRecapito *f = (OrganigrammaPersonaRecapito *)user_data; + OrganigrammaPersonaRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_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_recapito_on_w_organigramma_persona_recapito_delete_event (GtkWidget *widget, GdkEvent *event, -- 2.49.0