Migrazione a libzakform di struttura allegato.

diff --git a/data/organigramma/form/struttura_allegato.form b/data/organigramma/form/struttura_allegato.form
index f70ac749fe09a723205ed513113abd2124d83484..d087fc1c96a347366de1d811e92d8317a49fb3c6 100644 (file)
--- a/data/organigramma/form/struttura_allegato.form
+++ b/data/organigramma/form/struttura_allegato.form
@@ -1,38 +1,42 @@
 <?xml version="1.0"?>
-<gtkform>
-
-       <table>struttura_allegati</table>
-
-       <widget type="label" name="label324" label="label323">
-               <field type="integer" name="id">
-                       <is-key>t</is-key>
-                       <auto-increment>t</auto-increment>
-               </field>
-       </widget>
-
-       <widget type="label" name="label330">
-               <field type="integer" name="id_strutture" />
-       </widget>
-
-       <widget type="entry" name="entry111" label="label328">
-               <field type="text" name="titolo">
-                       <obligatory>t</obligatory>
-               </field>
-       </widget>
-
-       <widget type="entry" name="entry109" label="label325">
-               <field type="text" name="descrizione" />
-       </widget>
-
-       <widget type="entry" name="entry110" label="label327">
-               <field type="datetime" name="data_documento">
-                       <datetime-type>date</datetime-type>
-                       <display-format>%d/%m/%Y</display-format>
-               </field>
-       </widget>
-
-       <widget type="textview" name="textview22" label="label326">
-               <field type="text" name="note" />
-       </widget>
-
-</gtkform>
+<zakform>
+  <element type="zak_form_gtk_form_element_label">
+    <name>id</name>
+    <type>integer</type>
+    <label>label323</label>
+    <is-key>TRUE</is-key>
+    <widget>label324</widget>
+  </element>
+  <element type="zak_form_gtk_form_element_label">
+    <name>id_strutture</name>
+    <type>integer</type>
+    <widget>label330</widget>
+  </element>
+  <element type="zak_form_gtk_form_element_entry">
+    <name>titolo</name>
+    <type>string</type>
+    <label>label328</label>
+    <widget>entry111</widget>
+    <validator type="zak_form_element_validator_notempty"/>
+  </element>
+  <element type="zak_form_gtk_form_element_entry">
+    <name>descrizione</name>
+    <type>string</type>
+    <label>label325</label>
+    <widget>entry109</widget>
+  </element>
+  <element type="zak_form_gtk_form_element_entry">
+    <name>data_documento</name>
+    <type>datetime</type>
+    <label>label327</label>
+    <widget>entry110</widget>
+    <format>%d/%m/%Y</format>
+    <validator type="zak_form_element_validator_date">%d/%m/%Y</validator>
+  </element>
+  <element type="zak_form_gtk_form_element_textview">
+    <name>note</name>
+    <type>string</type>
+    <label>label326</label>
+    <widget>textview22</widget>
+  </element>
+</zakform>

diff --git a/src/strutturaallegato.c b/src/strutturaallegato.c
index 9ddad88bab909372f4c89d414625ad74e43d58c8..201722c80956dfc4690ce55e276f002f40636a34 100644 (file)
--- a/src/strutturaallegato.c
+++ b/src/strutturaallegato.c
@@ -21,7 +21,9 @@
 
 #include <libsolipa/libsolipa.h>
 #include <libzakautho/autoz.h>
-#include <libgtkform/form.h>
+#include <libzakform/libzakform.h>
+#include <libzakformgtk/libzakformgtk.h>
+#include <libzakformgdaex/libzakformgdaex.h>
 
 #include "strutturaallegato.h"
 
@@ -66,7 +68,8 @@ struct _OrganigrammaStrutturaAllegatoPrivate
        {
                OrganigrammaCommons *commons;
 
-               GtkForm *form;
+               ZakFormGtkForm *form;
+               ZakFormGdaexProvider *form_provider;
 
                GtkWidget *w;
                SolipaAllegato *sallegato;
@@ -140,15 +143,15 @@ OrganigrammaStrutturaAllegato
                        return NULL;
                }
 
-       priv->form = gtk_form_new ();
-       g_object_set (priv->form, "gdaex", priv->commons->gdaex, NULL);
-       gtk_form_load_from_file (priv->form, g_build_filename (priv->commons->formdir, "struttura_allegato.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, "struttura_allegato.form", NULL));
 
-       g_object_set (priv->form, "gdaex", priv->commons->gdaex, NULL);
+       priv->form_provider = zak_form_gdaex_provider_new (priv->commons->gdaex, "struttura_allegati");
 
        priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_struttura_allegato"));
 
-       priv->objects = gtk_form_get_objects_by_name (priv->form,
+       priv->objects = zak_form_gtk_form_get_gobjects_by_name (priv->form,
                                                      "label324",
                                                      "label330",
                                                      NULL);
@@ -156,7 +159,7 @@ OrganigrammaStrutturaAllegato
        priv->sallegato = solipa_allegato_new (commons->solipa);
        if (priv->sallegato != NULL)
                {
-                       solipa_allegato_add_to_gtkform (priv->sallegato, priv->form,
+                       solipa_allegato_add_to_zakformgtk (priv->sallegato, priv->form,
                                                        "percorso", "data_file", "dimensione_file");
                        solipa_allegato_con_salva_in_db (priv->sallegato, FALSE);
                        gtk_container_add (GTK_CONTAINER (gtk_builder_get_object (priv->commons->gtkbuilder, "alignment32")),
@@ -173,7 +176,7 @@ OrganigrammaStrutturaAllegato
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button190"),
                          "clicked", G_CALLBACK (organigramma_struttura_allegato_on_btn_salvachiudi_clicked), (gpointer)a);
 
-       gtk_form_clear (priv->form);
+       zak_form_form_clear (ZAK_FORM_FORM (priv->form));
 
        priv->id = id;
        if (priv->id == 0)
@@ -186,7 +189,7 @@ OrganigrammaStrutturaAllegato
                                        solipa_allegato_set_salva_in_db (priv->sallegato, TRUE);
                                }
 
-                       gtk_form_set_as_origin (priv->form);
+                       zak_form_form_set_as_original (ZAK_FORM_FORM (priv->form));
                }
        else
                {
@@ -223,7 +226,7 @@ organigramma_struttura_allegato_carica (OrganigrammaStrutturaAllegato *organigra
 {
        OrganigrammaStrutturaAllegatoPrivate *priv = ORGANIGRAMMA_STRUTTURA_ALLEGATO_GET_PRIVATE (organigramma_struttura_allegato);
 
-       if (gtk_form_fill_from_table (priv->form))
+       if (zak_form_form_load (ZAK_FORM_FORM (priv->form), ZAK_FORM_IPROVIDER (priv->form_provider)))
                {
                        solipa_allegato_set_salva_in_db (priv->sallegato, TRUE);
                }
@@ -232,34 +235,44 @@ organigramma_struttura_allegato_carica (OrganigrammaStrutturaAllegato *organigra
 static void
 organigramma_struttura_allegato_salva (OrganigrammaStrutturaAllegato *organigramma_struttura_allegato, gboolean chiudi)
 {
+       gboolean success;
+
        gchar *sql;
-       GtkWidget *dialog;
 
        OrganigrammaStrutturaAllegatoClass *klass = ORGANIGRAMMA_STRUTTURA_ALLEGATO_GET_CLASS (organigramma_struttura_allegato);
 
        OrganigrammaStrutturaAllegatoPrivate *priv = ORGANIGRAMMA_STRUTTURA_ALLEGATO_GET_PRIVATE (organigramma_struttura_allegato);
 
-       if (!gtk_form_check (priv->form, (priv->id != 0), 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,
+                                                                          "struttura_allegati",
+                                                                          "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_free (sql);
-
                        g_signal_emit (organigramma_struttura_allegato, klass->aggiornato_signal_id, 0);
 
-                       gtk_form_set_as_origin (priv->form);
+                       zak_form_form_set_as_original (ZAK_FORM_FORM (priv->form));
 
                        if (priv->id == 0)
                                {
@@ -347,8 +360,6 @@ organigramma_struttura_allegato_salva (OrganigrammaStrutturaAllegato *organigram
                }
        else
                {
-                       g_free (sql);
-
                        if (priv->id == 0)
                                {
                                        gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID]), "");
@@ -397,7 +408,7 @@ organigramma_struttura_allegato_conferma_chiusura (OrganigrammaStrutturaAllegato
        OrganigrammaStrutturaAllegatoPrivate *priv = ORGANIGRAMMA_STRUTTURA_ALLEGATO_GET_PRIVATE (organigramma_struttura_allegato);
 
        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,