From: Andrea Zagli Date: Tue, 13 Dec 2016 09:53:42 +0000 (+0100) Subject: Migrazione a libzakform di persona ufficio recapito. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=ffad02d48fb2108a841d78ba28e530c2bb169595;p=solipa%2Forganigramma Migrazione a libzakform di persona ufficio recapito. --- diff --git a/data/organigramma/form/persona_ufficio_recapito.form b/data/organigramma/form/persona_ufficio_recapito.form index add3246..0ff5444 100644 --- a/data/organigramma/form/persona_ufficio_recapito.form +++ b/data/organigramma/form/persona_ufficio_recapito.form @@ -1,51 +1,45 @@ - - - persona_ufficio_recapiti
- - - - t - t - - - - - - - - - - - - - - - - - SELECT a.nome - FROM tipi_recapito AS a - WHERE a.id = ##key0::gint - - - - t - - - - - - t - - - - - - - - - - - - - + + + id + integer + TRUE + label96 + + + id_persone + integer + label100 + + + id_uffici + integer + label97 + + + id_tipi_recapito + integer + + zakgtkdecoder2 + 0 + + + recapito + string + + entry24 + + + + note + string + + textview10 + + + privato + boolean + + checkbutton9 + + diff --git a/data/organigramma/gui/organigramma.gui b/data/organigramma/gui/organigramma.gui index 165cc60..3965eea 100644 --- a/data/organigramma/gui/organigramma.gui +++ b/data/organigramma/gui/organigramma.gui @@ -6144,7 +6144,7 @@ - + True False diff --git a/src/personaufficiorecapito.c b/src/personaufficiorecapito.c index 63bbc11..2028159 100644 --- a/src/personaufficiorecapito.c +++ b/src/personaufficiorecapito.c @@ -24,8 +24,11 @@ #include #include -#include -#include +#include +#include +#include +#include +#include #include #include "personaufficiorecapito.h" @@ -38,6 +41,7 @@ static void organigramma_persona_ufficio_recapito_carica (OrganigrammaPersonaUff static void organigramma_persona_ufficio_recapito_salva (OrganigrammaPersonaUfficioRecapito *organigramma_persona_ufficio_recapito, gboolean chiudi); static gboolean organigramma_persona_ufficio_recapito_conferma_chiusura (OrganigrammaPersonaUfficioRecapito *organigramma_persona_ufficio_recapito); +static gchar *organigramma_persona_ufficio_recapito_on_tipo_recapito_decode (gpointer instance, gchar *key, gpointer user_data); static void organigramma_persona_ufficio_recapito_on_tipo_recapito_selezionato (gpointer instance, guint id, gpointer user_data); @@ -79,7 +83,8 @@ struct _OrganigrammaPersonaUfficioRecapitoPrivate { OrganigrammaCommons *commons; - GtkForm *form; + ZakFormGtkForm *form; + ZakFormGdaexProvider *form_provider; GtkWidget *w; @@ -154,13 +159,15 @@ OrganigrammaPersonaUfficioRecapito 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_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, "persona_ufficio_recapito.form", NULL)); + + priv->form_provider = zak_form_gdaex_provider_new (priv->commons->gdaex, "persona_ufficio_recapiti"); priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_persona_ufficio_recapito")); - priv->objects = gtk_form_get_objects_by_name (priv->form, + priv->objects = zak_form_gtk_form_get_gobjects_by_name (priv->form, "label96", "label100", "label97", @@ -169,8 +176,10 @@ OrganigrammaPersonaUfficioRecapito g_signal_connect (priv->w, "delete-event", G_CALLBACK (organigramma_persona_ufficio_recapito_on_w_organigramma_persona_ufficio_recapito_delete_event), (gpointer)a); - g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "gtkformdecoder8"), + g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "zakgtkdecoder2"), "btn-browse-clicked", G_CALLBACK (organigramma_persona_ufficio_recapito_on_btn_tipo_recapito_clicked), (gpointer)a); + g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "zakgtkdecoder2"), + "decode", G_CALLBACK (organigramma_persona_ufficio_recapito_on_tipo_recapito_decode), (gpointer)a); g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button85")), "clicked", G_CALLBACK (organigramma_persona_ufficio_recapito_on_btn_annulla_clicked), (gpointer)a); @@ -179,6 +188,8 @@ OrganigrammaPersonaUfficioRecapito g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button162")), "clicked", G_CALLBACK (organigramma_persona_ufficio_recapito_on_btn_salvaechiudi_clicked), (gpointer)a); + zak_form_form_clear (ZAK_FORM_FORM (priv->form)); + priv->id = id; if (priv->id == 0) { @@ -186,7 +197,7 @@ OrganigrammaPersonaUfficioRecapito 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_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 { @@ -222,12 +233,9 @@ GtkWidget static void organigramma_persona_ufficio_recapito_carica (OrganigrammaPersonaUfficioRecapito *organigramma_persona_ufficio_recapito) { - gchar *sql; - GdaDataModel *dm; - OrganigrammaPersonaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO_GET_PRIVATE (organigramma_persona_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))) { } } @@ -235,27 +243,38 @@ organigramma_persona_ufficio_recapito_carica (OrganigrammaPersonaUfficioRecapito static void organigramma_persona_ufficio_recapito_salva (OrganigrammaPersonaUfficioRecapito *organigramma_persona_ufficio_recapito, gboolean chiudi) { - gchar *sql; + gboolean success; OrganigrammaPersonaUfficioRecapitoClass *klass = ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO_GET_CLASS (organigramma_persona_ufficio_recapito); OrganigrammaPersonaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO_GET_PRIVATE (organigramma_persona_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, + "persona_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_persona_ufficio_recapito, klass->aggiornato_signal_id, 0); @@ -264,7 +283,7 @@ organigramma_persona_ufficio_recapito_salva (OrganigrammaPersonaUfficioRecapito 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, @@ -323,7 +342,7 @@ organigramma_persona_ufficio_recapito_conferma_chiusura (OrganigrammaPersonaUffi 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, @@ -344,10 +363,36 @@ organigramma_persona_ufficio_recapito_on_tipo_recapito_selezionato (gpointer ins OrganigrammaPersonaUfficioRecapito *f = (OrganigrammaPersonaUfficioRecapito *)user_data; OrganigrammaPersonaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO_GET_PRIVATE (f); - gtk_form_widget_set_value_stringify (gtk_form_get_form_widget_from_name (priv->form, "gtkformdecoder8"), + zak_gtk_decoder_set_key (ZAK_GTK_DECODER (gtk_builder_get_object (priv->commons->gtkbuilder, "zakgtkdecoder2")), g_strdup_printf ("%d", id)); } +static gchar +*organigramma_persona_ufficio_recapito_on_tipo_recapito_decode (gpointer instance, gchar *key, gpointer user_data) +{ + GString *ret; + gchar *sql; + GdaDataModel *dm; + + OrganigrammaPersonaUfficioRecapito *f = (OrganigrammaPersonaUfficioRecapito *)user_data; + OrganigrammaPersonaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_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_persona_ufficio_recapito_on_w_organigramma_persona_ufficio_recapito_delete_event (GtkWidget *widget, GdkEvent *event,