From 0e7d65debf574a167e452b54226e0842eaca0344 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Tue, 13 Dec 2016 11:28:08 +0100 Subject: [PATCH] Migrazione a libzakform di ufficio recapito. --- data/organigramma/form/ufficio_recapito.form | 83 +++++++++---------- data/organigramma/gui/organigramma.gui | 2 +- src/ufficiorecapito.c | 87 +++++++++++++++----- 3 files changed, 106 insertions(+), 66 deletions(-) diff --git a/data/organigramma/form/ufficio_recapito.form b/data/organigramma/form/ufficio_recapito.form index 2376f0e..dcd450a 100644 --- a/data/organigramma/form/ufficio_recapito.form +++ b/data/organigramma/form/ufficio_recapito.form @@ -1,45 +1,40 @@ - - - ufficio_recapiti
- - - - t - t - - - - - - - - - - - - SELECT a.nome - FROM tipi_recapito AS a - WHERE a.id = ##key0::gint - - - - t - - - - - - t - - - - - - - - - - - - + + + id + integer + TRUE + label41 + + + id_uffici + integer + label42 + + + id_tipi_recapito + integer + + zakgtkdecoder3 + 0 + + + recapito + string + + entry6 + + + + note + string + + textview5 + + + privato + boolean + + checkbutton8 + + diff --git a/data/organigramma/gui/organigramma.gui b/data/organigramma/gui/organigramma.gui index 3965eea..f8d48ee 100644 --- a/data/organigramma/gui/organigramma.gui +++ b/data/organigramma/gui/organigramma.gui @@ -10279,7 +10279,7 @@ - + True False diff --git a/src/ufficiorecapito.c b/src/ufficiorecapito.c index 43dbba8..1e541cd 100644 --- a/src/ufficiorecapito.c +++ b/src/ufficiorecapito.c @@ -24,8 +24,11 @@ #include #include -#include -#include +#include +#include +#include +#include +#include #include #include "ufficiorecapito.h" @@ -40,6 +43,7 @@ static void organigramma_ufficio_recapito_salva (OrganigrammaUfficioRecapito *or static gboolean organigramma_ufficio_recapito_conferma_chiusura (OrganigrammaUfficioRecapito *organigramma_ufficio_recapito); static void organigramma_ufficio_recapito_on_tipo_recapito_selezionato (gpointer instance, guint id, gpointer user_data); +static gchar *organigramma_ufficio_recapito_on_tipo_recapito_decode (gpointer instance, gchar *key, gpointer user_data); static void organigramma_ufficio_recapito_set_property (GObject *object, guint property_id, @@ -78,7 +82,8 @@ struct _OrganigrammaUfficioRecapitoPrivate { OrganigrammaCommons *commons; - GtkForm *form; + ZakFormGtkForm *form; + ZakFormGdaexProvider *form_provider; GtkWidget *w; @@ -152,13 +157,15 @@ OrganigrammaUfficioRecapito 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, "ufficio_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, "ufficio_recapito.form", NULL)); + + priv->form_provider = zak_form_gdaex_provider_new (priv->commons->gdaex, "ufficio_recapiti"); priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_ufficio_recapito")); - priv->objects = gtk_form_get_objects_by_name (priv->form, + priv->objects = zak_form_gtk_form_get_gobjects_by_name (priv->form, "label41", "label42", NULL); @@ -166,8 +173,10 @@ OrganigrammaUfficioRecapito g_signal_connect (priv->w, "delete-event", G_CALLBACK (organigramma_ufficio_recapito_on_w_organigramma_ufficio_recapito_delete_event), (gpointer)a); - g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "gtkformdecoder7"), + g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "zakgtkdecoder3"), "btn-browse-clicked", G_CALLBACK (organigramma_ufficio_recapito_on_btn_tipo_recapito_clicked), (gpointer)a); + g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "zakgtkdecoder3"), + "decode", G_CALLBACK (organigramma_ufficio_recapito_on_tipo_recapito_decode), (gpointer)a); g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button48")), "clicked", G_CALLBACK (organigramma_ufficio_recapito_on_btn_annulla_clicked), (gpointer)a); @@ -176,13 +185,15 @@ OrganigrammaUfficioRecapito g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button156")), "clicked", G_CALLBACK (organigramma_ufficio_recapito_on_btn_salvaechiudi_clicked), (gpointer)a); + zak_form_form_clear (ZAK_FORM_FORM (priv->form)); + priv->id = id; if (priv->id == 0) { gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID]), ""); gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID_UFFICI]), g_strdup_printf ("%d", id_uffici)); - gtk_form_set_as_origin (priv->form); + zak_form_form_set_as_original (ZAK_FORM_FORM (priv->form)); } else { @@ -218,12 +229,9 @@ GtkWidget static void organigramma_ufficio_recapito_carica (OrganigrammaUfficioRecapito *organigramma_ufficio_recapito) { - gchar *sql; - GdaDataModel *dm; - OrganigrammaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_UFFICIO_RECAPITO_GET_PRIVATE (organigramma_ufficio_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))) { } } @@ -231,27 +239,38 @@ organigramma_ufficio_recapito_carica (OrganigrammaUfficioRecapito *organigramma_ static void organigramma_ufficio_recapito_salva (OrganigrammaUfficioRecapito *organigramma_ufficio_recapito, gboolean chiudi) { - gchar *sql; + gboolean success; OrganigrammaUfficioRecapitoClass *klass = ORGANIGRAMMA_UFFICIO_RECAPITO_GET_CLASS (organigramma_ufficio_recapito); OrganigrammaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_UFFICIO_RECAPITO_GET_PRIVATE (organigramma_ufficio_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, + "ufficio_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_ufficio_recapito, klass->aggiornato_signal_id, 0); @@ -260,7 +279,7 @@ organigramma_ufficio_recapito_salva (OrganigrammaUfficioRecapito *organigramma_u 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, @@ -319,7 +338,7 @@ organigramma_ufficio_recapito_conferma_chiusura (OrganigrammaUfficioRecapito *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, @@ -340,10 +359,36 @@ organigramma_ufficio_recapito_on_tipo_recapito_selezionato (gpointer instance, g OrganigrammaUfficioRecapito *f = (OrganigrammaUfficioRecapito *)user_data; OrganigrammaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_UFFICIO_RECAPITO_GET_PRIVATE (f); - gtk_form_widget_set_value_stringify (gtk_form_get_form_widget_from_name (priv->form, "gtkformdecoder7"), + zak_gtk_decoder_set_key (ZAK_GTK_DECODER (gtk_builder_get_object (priv->commons->gtkbuilder, "zakgtkdecoder3")), g_strdup_printf ("%d", id)); } +static gchar +*organigramma_ufficio_recapito_on_tipo_recapito_decode (gpointer instance, gchar *key, gpointer user_data) +{ + GString *ret; + gchar *sql; + GdaDataModel *dm; + + OrganigrammaUfficioRecapito *f = (OrganigrammaUfficioRecapito *)user_data; + OrganigrammaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_UFFICIO_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_ufficio_recapito_on_w_organigramma_ufficio_recapito_delete_event (GtkWidget *widget, GdkEvent *event, -- 2.49.0