Aggiunto il ruolo alle persone-ufficio (closes #595).

diff --git a/data/organigramma/form/persona_ufficio.form b/data/organigramma/form/persona_ufficio.form
index b83de62313b4f77100b5004bee5cc0488a6f2f27..a0b7f42bc2ff96aa089e949450c23ccbfc48a9a0 100644 (file)
--- a/data/organigramma/form/persona_ufficio.form
+++ b/data/organigramma/form/persona_ufficio.form
@@ -34,6 +34,17 @@
                </field>
        </widget>
 
+       <widget type="decoder" name="gtkformdecoder1" label="label177">
+               <decoder>
+                       <sql>
+                               SELECT nome FROM ruoli WHERE id = ##key0::gint
+                       </sql>
+               </decoder>
+               <field type="integer" name="id_ruoli">
+                       <obligatory>t</obligatory>
+               </field>
+       </widget>
+
        <widget type="entry" name="entry22" label="label92">
                <field type="datetime" name="da_data">
                        <datetime-type>date</datetime-type>

diff --git a/data/organigramma/gui/organigramma.gui b/data/organigramma/gui/organigramma.gui
index 829b297efd75ff42af6852733b335d55ea81a7ce..cfd8cb0bd83db00b82faad99e9f590255840c9a7 100644 (file)
--- a/data/organigramma/gui/organigramma.gui
+++ b/data/organigramma/gui/organigramma.gui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.24"/>
+  <!-- interface-requires gtkformui 0.0 -->
   <!-- interface-naming-policy project-wide -->
   <object class="GtkAdjustment" id="adj_dmon">
     <property name="upper">31</property>
@@ -156,12 +157,28 @@
       <column type="gchararray"/>
     </columns>
   </object>
+  <object class="GtkListStore" id="lstore_ufficio_persone">
+    <columns>
+      <!-- column-name id -->
+      <column type="guint"/>
+      <!-- column-name ruolo -->
+      <column type="gchararray"/>
+      <!-- column-name nome -->
+      <column type="gchararray"/>
+      <!-- column-name da_data -->
+      <column type="gchararray"/>
+      <!-- column-name a_data -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkListStore" id="lstore_persona_uffici">
     <columns>
       <!-- column-name id -->
       <column type="guint"/>
       <!-- column-name ufficio -->
       <column type="gchararray"/>
+      <!-- column-name ruolo -->
+      <column type="gchararray"/>
       <!-- column-name da_data -->
       <column type="gchararray"/>
       <!-- column-name a_data -->
@@ -286,18 +303,6 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="lstore_ufficio_persone">
-    <columns>
-      <!-- column-name id -->
-      <column type="guint"/>
-      <!-- column-name nome -->
-      <column type="gchararray"/>
-      <!-- column-name da_data -->
-      <column type="gchararray"/>
-      <!-- column-name a_data -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
   <object class="GtkListStore" id="lstore_ufficio_recapiti">
     <columns>
       <!-- column-name tipo -->
@@ -1662,13 +1667,24 @@
                                         </child>
                                       </object>
                                     </child>
+                                    <child>
+                                      <object class="GtkTreeViewColumn" id="treeviewcolumn42">
+                                        <property name="title" translatable="yes">Ruolo</property>
+                                        <child>
+                                          <object class="GtkCellRendererText" id="cellrenderertext53"/>
+                                          <attributes>
+                                            <attribute name="text">2</attribute>
+                                          </attributes>
+                                        </child>
+                                      </object>
+                                    </child>
                                     <child>
                                       <object class="GtkTreeViewColumn" id="treeviewcolumn19">
                                         <property name="title">Da data</property>
                                         <child>
                                           <object class="GtkCellRendererText" id="cellrenderertext24"/>
                                           <attributes>
-                                            <attribute name="text">2</attribute>
+                                            <attribute name="text">3</attribute>
                                           </attributes>
                                         </child>
                                       </object>
@@ -1679,7 +1695,7 @@
                                         <child>
                                           <object class="GtkCellRendererText" id="cellrenderertext25"/>
                                           <attributes>
-                                            <attribute name="text">3</attribute>
+                                            <attribute name="text">4</attribute>
                                           </attributes>
                                         </child>
                                       </object>
@@ -3536,7 +3552,7 @@
           <object class="GtkTable" id="table11">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="n_rows">7</property>
+            <property name="n_rows">8</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">5</property>
             <property name="row_spacing">5</property>
@@ -3549,8 +3565,8 @@
                 <property name="label" translatable="yes">Note</property>
               </object>
               <packing>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -3572,8 +3588,8 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
               </packing>
             </child>
             <child>
@@ -3648,8 +3664,8 @@
                 <property name="label" translatable="yes">lbl_id</property>
               </object>
               <packing>
-                <property name="top_attach">6</property>
-                <property name="bottom_attach">7</property>
+                <property name="top_attach">7</property>
+                <property name="bottom_attach">8</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -3662,8 +3678,8 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">6</property>
-                <property name="bottom_attach">7</property>
+                <property name="top_attach">7</property>
+                <property name="bottom_attach">8</property>
               </packing>
             </child>
             <child>
@@ -3674,8 +3690,8 @@
                 <property name="label" translatable="yes">Da data</property>
               </object>
               <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -3694,8 +3710,8 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
@@ -3707,8 +3723,8 @@
                 <property name="label" translatable="yes">A data</property>
               </object>
               <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -3727,8 +3743,8 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
@@ -3740,8 +3756,8 @@
                 <property name="label" translatable="yes">Piano</property>
               </object>
               <packing>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -3760,8 +3776,8 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
@@ -3773,8 +3789,8 @@
                 <property name="label" translatable="yes">Stanza</property>
               </object>
               <packing>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -3793,8 +3809,35 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label177">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Ruolo</property>
+              </object>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFormDecoder" id="gtkformdecoder1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
@@ -8411,13 +8454,24 @@
                             <property name="headers_clickable">False</property>
                             <property name="rules_hint">True</property>
                             <property name="search_column">0</property>
+                            <child>
+                              <object class="GtkTreeViewColumn" id="treeviewcolumn43">
+                                <property name="title" translatable="yes">Ruolo</property>
+                                <child>
+                                  <object class="GtkCellRendererText" id="cellrenderertext54"/>
+                                  <attributes>
+                                    <attribute name="text">1</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                            </child>
                             <child>
                               <object class="GtkTreeViewColumn" id="treeviewcolumn40">
                                 <property name="title">Nome</property>
                                 <child>
                                   <object class="GtkCellRendererText" id="cellrenderertext51"/>
                                   <attributes>
-                                    <attribute name="text">1</attribute>
+                                    <attribute name="text">2</attribute>
                                   </attributes>
                                 </child>
                               </object>
@@ -8428,7 +8482,7 @@
                                 <child>
                                   <object class="GtkCellRendererText" id="cellrenderertext12"/>
                                   <attributes>
-                                    <attribute name="text">2</attribute>
+                                    <attribute name="text">3</attribute>
                                   </attributes>
                                 </child>
                               </object>
@@ -8439,7 +8493,7 @@
                                 <child>
                                   <object class="GtkCellRendererText" id="cellrenderertext50"/>
                                   <attributes>
-                                    <attribute name="text">3</attribute>
+                                    <attribute name="text">4</attribute>
                                   </attributes>
                                 </child>
                               </object>

diff --git a/docs/DBChangelog b/docs/DBChangelog
index 27da7a1e42631e0dcbca089c78aa41abe9bcd8c8..ac58a68822a7f8ea08fcc04da8bd05afff0851c2 100644 (file)
--- a/docs/DBChangelog
+++ b/docs/DBChangelog
@@ -12,4 +12,6 @@ CREATE TABLE ruoli
        nome character varying(255) DEFAULT '',
        status character varying(1) DEFAULT '',
        CONSTRAINT ruoli_pkey PRIMARY KEY (id)
-);
\ No newline at end of file
+);
+
+ALTER TABLE persona_uffici ADD COLUMN id_ruoli integer DEFAULT 0;

diff --git a/libreria/Makefile.am b/libreria/Makefile.am
index c17062a41decc8faa3e12f5607c115a45ca5ce5f..0da44f9722da90a81e7bc4230d82ef405373d17f 100644 (file)
--- a/libreria/Makefile.am
+++ b/libreria/Makefile.am
@@ -27,6 +27,10 @@ liborganigramma_la_SOURCES = \
                 ../src/posizionieconomiche.c \
                 ../src/profiliprofessionali.c \
                 ../src/profiloprofessionale.c \
+                ../src/ruoli.c \
+                ../src/ruoli.h \
+                ../src/ruolo.c \
+                ../src/ruolo.h \
                 ../src/struttura.c \
                 ../src/strutturaindirizzo.c \
                 ../src/strutture.c \

diff --git a/src/persona.c b/src/persona.c
index b69b06c58a42cb5b577b27666d993239c8bff0e0..a05752e7ab31a08ca714d17bd769fa7380574fb3 100644 (file)
--- a/src/persona.c
+++ b/src/persona.c
@@ -201,6 +201,7 @@ enum
 {
        UFFICI_COL_ID,
        UFFICI_COL_UFFICIO,
+       UFFICI_COL_RUOLO,
        UFFICI_COL_DA_DATA,
        UFFICI_COL_A_DATA
 };
@@ -715,10 +716,10 @@ organigramma_persona_carica_uffici (OrganigrammaPersona *persona)
 
        gtk_list_store_clear (GTK_LIST_STORE (priv->objects[LSTORE_UFFICI]));
 
-       sql = g_strdup_printf ("SELECT pu.id, u.nome, pu.da_data, pu.a_data"
+       sql = g_strdup_printf ("SELECT pu.id, u.nome, r.nome AS ruolo, pu.da_data, pu.a_data"
                               " FROM persona_uffici AS pu"
-                              " INNER JOIN uffici AS u ON"
-                              " pu.id_uffici = u.id"
+                              " INNER JOIN uffici AS u ON pu.id_uffici = u.id"
+                              " INNER JOIN ruoli AS r ON pu.id_ruoli = r.id"
                               " WHERE pu.id_persone = %d"
                               " AND pu.status <> 'E'"
                               " ORDER BY pu.da_data, pu.a_data, u.nome",
@@ -736,6 +737,7 @@ organigramma_persona_carica_uffici (OrganigrammaPersona *persona)
                                        gtk_list_store_set (GTK_LIST_STORE (priv->objects[LSTORE_UFFICI]), &iter,
                                                            UFFICI_COL_ID, gdaex_data_model_get_field_value_integer_at (dm, row, "id"),
                                                            UFFICI_COL_UFFICIO, gdaex_data_model_get_field_value_stringify_at (dm, row, "nome"),
+                                                           UFFICI_COL_RUOLO, gdaex_data_model_get_field_value_stringify_at (dm, row, "ruolo"),
                                                            UFFICI_COL_DA_DATA, gtk_form_field_datetime_get_str_from_tm (gdaex_data_model_get_field_value_tm_at (dm, row, "da_data"), "%d/%m/%Y"),
                                                            UFFICI_COL_A_DATA, gtk_form_field_datetime_get_str_from_tm (gdaex_data_model_get_field_value_tm_at (dm, row, "a_data"), "%d/%m/%Y"),
                                                            -1);

diff --git a/src/personaufficio.c b/src/personaufficio.c
index 7d35e781f60c5e2866aa7570229c19433578cb4b..d079b124caa73b1e83cdd34965a0503cbdf3bf58 100644 (file)
--- a/src/personaufficio.c
+++ b/src/personaufficio.c
@@ -23,10 +23,12 @@
 
 #include <libautoz/autoz.h>
 #include <libgtkform/form.h>
+#include <libgtkformui/gtkformdecoder.h>
 #include <libsolipa/utils.h>
 
 #include "personaufficio.h"
 #include "uffici.h"
+#include "ruoli.h"
 
 static void organigramma_persona_ufficio_class_init (OrganigrammaPersonaUfficioClass *klass);
 static void organigramma_persona_ufficio_init (OrganigrammaPersonaUfficio *organigramma_persona_ufficio);
@@ -36,6 +38,7 @@ static void organigramma_persona_ufficio_salva (OrganigrammaPersonaUfficio *orga
 
 static gboolean organigramma_persona_ufficio_conferma_chiusura (OrganigrammaPersonaUfficio *organigramma_persona_ufficio);
 
+static void organigramma_persona_ufficio_on_ruolo_selezionato (gpointer instance, guint id, gpointer user_data);
 static void organigramma_persona_ufficio_on_ufficio_selezionato (gpointer instance,
                                           guint id, gpointer user_data);
 
@@ -52,8 +55,11 @@ static gboolean organigramma_persona_ufficio_on_w_organigramma_persona_ufficio_d
                                GdkEvent *event,
                                gpointer user_data);
 
-static void organigramma_persona_ufficio_on_btn_ricerca_via_clicked (GtkButton *button,
+static void organigramma_persona_ufficio_on_btn_ufficio_clicked (GtkButton *button,
                                     gpointer user_data);
+static void organigramma_persona_ufficio_on_btn_ruolo_clicked (GtkButton *button,
+                                    gpointer user_data);
+
 static void organigramma_persona_ufficio_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
 static void organigramma_persona_ufficio_on_btn_salva_clicked (GtkButton *button,
@@ -164,7 +170,10 @@ OrganigrammaPersonaUfficio
                          "delete-event", G_CALLBACK (organigramma_persona_ufficio_on_w_organigramma_persona_ufficio_delete_event), (gpointer)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button82")),
-                         "clicked", G_CALLBACK (organigramma_persona_ufficio_on_btn_ricerca_via_clicked), (gpointer)a);
+                         "clicked", G_CALLBACK (organigramma_persona_ufficio_on_btn_ufficio_clicked), (gpointer)a);
+
+       g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "gtkformdecoder1"),
+                         "btn-browse-clicked", G_CALLBACK (organigramma_persona_ufficio_on_btn_ruolo_clicked), (gpointer)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button83")),
                          "clicked", G_CALLBACK (organigramma_persona_ufficio_on_btn_annulla_clicked), (gpointer)a);
@@ -352,7 +361,17 @@ organigramma_persona_ufficio_on_w_organigramma_persona_ufficio_delete_event (Gtk
 }
 
 static void
-organigramma_persona_ufficio_on_btn_ricerca_via_clicked (GtkButton *button,
+organigramma_persona_ufficio_on_ruolo_selezionato (gpointer instance, guint id, gpointer user_data)
+{
+       OrganigrammaPersonaUfficio *a = (OrganigrammaPersonaUfficio *)user_data;
+       OrganigrammaPersonaUfficioPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_GET_PRIVATE (a);
+
+       gtk_form_widget_set_value_stringify (gtk_form_get_form_widget_from_name (priv->form, "gtkformdecoder1"),
+                                            g_strdup_printf ("%d", id));
+}
+
+static void
+organigramma_persona_ufficio_on_btn_ufficio_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkWidget *w;
@@ -370,6 +389,25 @@ organigramma_persona_ufficio_on_btn_ricerca_via_clicked (GtkButton *button,
        gtk_widget_show (w);
 }
 
+static void
+organigramma_persona_ufficio_on_btn_ruolo_clicked (GtkButton *button,
+                        gpointer user_data)
+{
+       GtkWidget *w;
+
+       OrganigrammaPersonaUfficio *ia = (OrganigrammaPersonaUfficio *)user_data;
+       OrganigrammaPersonaUfficioPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_GET_PRIVATE (ia);
+
+       OrganigrammaRuoli *c = organigramma_ruoli_new (priv->commons, TRUE);
+
+       g_signal_connect (G_OBJECT (c), "selezionato",
+                         G_CALLBACK (organigramma_persona_ufficio_on_ruolo_selezionato), user_data);
+
+       w = organigramma_ruoli_get_widget (c);
+       gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
+       gtk_widget_show (w);
+}
+
 static void
 organigramma_persona_ufficio_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)

diff --git a/src/ufficio.c b/src/ufficio.c
index 3375d38106d8305cddb4fe6690bb8e27f19eff82..fdc63774983cac2861b6397444173b5b61a0768d 100644 (file)
--- a/src/ufficio.c
+++ b/src/ufficio.c
@@ -180,6 +180,7 @@ enum
 enum
 {
        PERSONE_COL_ID,
+       PERSONE_COL_RUOLO,
        PERSONE_COL_NOME,
        PERSONE_COL_DA_DATA,
        PERSONE_COL_A_DATA
@@ -664,9 +665,11 @@ organigramma_ufficio_carica_persone (OrganigrammaUfficio *ufficio)
        gtk_list_store_clear (GTK_LIST_STORE (priv->objects[LSTORE_PERSONE]));
 
        sql = g_strdup_printf ("SELECT p.id, p.cognome || ' ' || p.nome AS cognome_nome,"
+                              " r.nome AS ruolo,"
                               " pi.da_data, pi.a_data"
                               " FROM persona_uffici AS pi"
                               " INNER JOIN persone AS p ON pi.id_persone = p.id"
+                              " INNER JOIN ruoli AS r ON pi.id_ruoli = r.id"
                               " WHERE pi.id_uffici = %d"
                               " AND pi.status <> 'E'"
                               " ORDER BY p.cognome, p.nome, pi.da_data, pi.a_data",
@@ -683,6 +686,7 @@ organigramma_ufficio_carica_persone (OrganigrammaUfficio *ufficio)
                                        gtk_list_store_append (GTK_LIST_STORE (priv->objects[LSTORE_PERSONE]), &iter);
                                        gtk_list_store_set (GTK_LIST_STORE (priv->objects[LSTORE_PERSONE]), &iter,
                                                            PERSONE_COL_ID, gdaex_data_model_get_field_value_integer_at (dm, row, "id"),
+                                                           PERSONE_COL_RUOLO, gdaex_data_model_get_field_value_stringify_at (dm, row, "ruolo"),
                                                            PERSONE_COL_NOME, gdaex_data_model_get_field_value_stringify_at (dm, row, "cognome_nome"),
                                                            PERSONE_COL_DA_DATA, gtk_form_field_datetime_get_str_from_tm (gdaex_data_model_get_field_value_tm_at (dm, row, "da_data"), "%d/%m/%Y"),
                                                            PERSONE_COL_A_DATA, gtk_form_field_datetime_get_str_from_tm (gdaex_data_model_get_field_value_tm_at (dm, row, "a_data"), "%d/%m/%Y"),