Correzioni varie.

diff --git a/data/organigramma/form/persona_ufficio.form b/data/organigramma/form/persona_ufficio.form
index 0177a9c15eec978e14abd320ca357ac5d97ca61d..2571f418493de4fa0e2ec167d4262bdf9e938fee 100644 (file)
--- a/data/organigramma/form/persona_ufficio.form
+++ b/data/organigramma/form/persona_ufficio.form
@@ -26,7 +26,7 @@
                <on-change what="update" when="after">
                        <widget-name>entry21</widget-name>
                        <sql>
-                               SELECT nome FROM ufficio WHERE id = ##label89::gint
+                               SELECT nome FROM uffici WHERE id = ##label89::gint
                        </sql>
                </on-change>
                <field type="integer" name="id_uffici">
@@ -48,7 +48,7 @@
        </widget>
 
        <widget type="textview" name="textview9" label="label87">
-               <field type="text" name="descrizione" />
+               <field type="text" name="note" />
        </widget>
 
 </gtkform>

diff --git a/data/organigramma/gui/organigramma.gui b/data/organigramma/gui/organigramma.gui
index 32d3d3b0028cf335f5174e0461f7ae8dc68ab479..0b43cf571dfe2b33d67f7660f8538ca2dae5ab24 100644 (file)
--- a/data/organigramma/gui/organigramma.gui
+++ b/data/organigramma/gui/organigramma.gui
@@ -986,6 +986,11 @@
   </object>
   <object class="GtkWindow" id="w_tipi_nodo">
     <property name="title" translatable="yes">Tipi nodo - Gestione organigramma</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="default_width">500</property>
+    <property name="default_height">400</property>
+    <property name="destroy_with_parent">True</property>
     <child>
       <object class="GtkVBox" id="vbx_tipi_nodo">
         <property name="visible">True</property>
@@ -1121,6 +1126,11 @@
   </object>
   <object class="GtkWindow" id="w_tipi_recapito">
     <property name="title" translatable="yes">Tipi recapito - Gestione organigramma</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="default_width">500</property>
+    <property name="default_height">400</property>
+    <property name="destroy_with_parent">True</property>
     <child>
       <object class="GtkVBox" id="vbx_tipi_recapito">
         <property name="visible">True</property>
@@ -1379,6 +1389,11 @@
   </object>
   <object class="GtkWindow" id="w_uffici">
     <property name="title" translatable="yes">Uffici - Gestione organigramma</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="default_width">500</property>
+    <property name="default_height">400</property>
+    <property name="destroy_with_parent">True</property>
     <child>
       <object class="GtkVBox" id="vbx_uffici">
         <property name="visible">True</property>
@@ -6703,6 +6718,11 @@
   </object>
   <object class="GtkWindow" id="w_persone">
     <property name="title" translatable="yes">Persone - Gestione organigramma</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="default_width">500</property>
+    <property name="default_height">400</property>
+    <property name="destroy_with_parent">True</property>
     <child>
       <object class="GtkVBox" id="vbx_persone">
         <property name="visible">True</property>
@@ -6836,7 +6856,7 @@
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="w_tipi_rapport_lavoro">
+  <object class="GtkWindow" id="w_tipi_rapporto_lavoro">
     <property name="title" translatable="yes">Tipi rapporto di lavoro - Gestione organigramma</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>

diff --git a/docs/organigramma.sql b/docs/organigramma.sql
index 9048efb84a0af9080dcdac51455fcb104fdd94fe..53446c4e3c7b5a61c54dfd8f2d87456775825d30 100644 (file)
--- a/docs/organigramma.sql
+++ b/docs/organigramma.sql
@@ -4,7 +4,7 @@
 
 -- Dumped from database version 8.4.4
 -- Dumped by pg_dump version 9.0.0
--- Started on 2010-10-13 08:52:29
+-- Started on 2010-10-13 10:20:10
 
 SET statement_timeout = 0;
 SET client_encoding = 'UTF8';
@@ -14,7 +14,7 @@ SET client_min_messages = warning;
 SET escape_string_warning = off;
 
 --
--- TOC entry 337 (class 2612 OID 16386)
+-- TOC entry 338 (class 2612 OID 16386)
 -- Name: plpgsql; Type: PROCEDURAL LANGUAGE; Schema: -; Owner: -
 --
 
@@ -26,8 +26,8 @@ SET search_path = public, pg_catalog;
 SET default_with_oids = false;
 
 --
--- TOC entry 1524 (class 1259 OID 59279)
--- Dependencies: 1815 1816 1817 3
+-- TOC entry 1525 (class 1259 OID 59279)
+-- Dependencies: 1816 1817 1818 3
 -- Name: nodi; Type: TABLE; Schema: public; Owner: -
 --
 
@@ -42,8 +42,8 @@ CREATE TABLE nodi (
 
 
 --
--- TOC entry 1534 (class 1259 OID 61206)
--- Dependencies: 1841 3
+-- TOC entry 1538 (class 1259 OID 61243)
+-- Dependencies: 1851 1852 3
 -- Name: persona_uffici; Type: TABLE; Schema: public; Owner: -
 --
 
@@ -53,6 +53,7 @@ CREATE TABLE persona_uffici (
     id_uffici integer,
     da_data date,
     a_data date,
+    note text DEFAULT ''::text,
     status character varying(1) DEFAULT ''::character varying
 );
 
@@ -74,8 +75,8 @@ CREATE TABLE persone (
 
 
 --
--- TOC entry 1530 (class 1259 OID 59346)
--- Dependencies: 1831 1832 1833 3
+-- TOC entry 1531 (class 1259 OID 59346)
+-- Dependencies: 1832 1833 1834 3
 -- Name: struttura_indirizzi; Type: TABLE; Schema: public; Owner: -
 --
 
@@ -90,8 +91,8 @@ CREATE TABLE struttura_indirizzi (
 
 
 --
--- TOC entry 1528 (class 1259 OID 59327)
--- Dependencies: 1825 1826 1827 1828 1829 3
+-- TOC entry 1529 (class 1259 OID 59327)
+-- Dependencies: 1826 1827 1828 1829 1830 3
 -- Name: strutture; Type: TABLE; Schema: public; Owner: -
 --
 
@@ -106,8 +107,8 @@ CREATE TABLE strutture (
 
 
 --
--- TOC entry 1525 (class 1259 OID 59290)
--- Dependencies: 1818 1819 3
+-- TOC entry 1526 (class 1259 OID 59290)
+-- Dependencies: 1819 1820 3
 -- Name: tipi_nodo; Type: TABLE; Schema: public; Owner: -
 --
 
@@ -132,8 +133,8 @@ CREATE TABLE tipi_rapporto_lavoro (
 
 
 --
--- TOC entry 1526 (class 1259 OID 59297)
--- Dependencies: 1820 1821 3
+-- TOC entry 1527 (class 1259 OID 59297)
+-- Dependencies: 1821 1822 3
 -- Name: tipi_recapito; Type: TABLE; Schema: public; Owner: -
 --
 
@@ -159,8 +160,8 @@ CREATE TABLE titoli (
 
 
 --
--- TOC entry 1527 (class 1259 OID 59311)
--- Dependencies: 1822 1823 1824 3
+-- TOC entry 1528 (class 1259 OID 59311)
+-- Dependencies: 1823 1824 1825 3
 -- Name: uffici; Type: TABLE; Schema: public; Owner: -
 --
 
@@ -174,8 +175,8 @@ CREATE TABLE uffici (
 
 
 --
--- TOC entry 1531 (class 1259 OID 59357)
--- Dependencies: 1834 1835 3
+-- TOC entry 1532 (class 1259 OID 59357)
+-- Dependencies: 1835 1836 3
 -- Name: ufficio_nodi; Type: TABLE; Schema: public; Owner: -
 --
 
@@ -189,8 +190,8 @@ CREATE TABLE ufficio_nodi (
 
 
 --
--- TOC entry 1532 (class 1259 OID 59399)
--- Dependencies: 1836 1837 3
+-- TOC entry 1533 (class 1259 OID 59399)
+-- Dependencies: 1837 1838 3
 -- Name: ufficio_orari; Type: TABLE; Schema: public; Owner: -
 --
 
@@ -217,8 +218,8 @@ CREATE TABLE ufficio_orari (
 
 
 --
--- TOC entry 1533 (class 1259 OID 59409)
--- Dependencies: 1838 1839 1840 3
+-- TOC entry 1534 (class 1259 OID 59409)
+-- Dependencies: 1839 1840 1841 3
 -- Name: ufficio_recapiti; Type: TABLE; Schema: public; Owner: -
 --
 
@@ -234,8 +235,8 @@ CREATE TABLE ufficio_recapiti (
 
 
 --
--- TOC entry 1529 (class 1259 OID 59340)
--- Dependencies: 1830 3
+-- TOC entry 1530 (class 1259 OID 59340)
+-- Dependencies: 1831 3
 -- Name: vie; Type: TABLE; Schema: public; Owner: -
 --
 
@@ -246,8 +247,8 @@ CREATE TABLE vie (
 
 
 --
--- TOC entry 1852 (class 2606 OID 59289)
--- Dependencies: 1524 1524
+-- TOC entry 1854 (class 2606 OID 59289)
+-- Dependencies: 1525 1525
 -- Name: nodi_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
 
@@ -256,8 +257,8 @@ ALTER TABLE ONLY nodi
 
 
 --
--- TOC entry 1872 (class 2606 OID 61211)
--- Dependencies: 1534 1534
+-- TOC entry 1880 (class 2606 OID 61252)
+-- Dependencies: 1538 1538
 -- Name: persona_uffici_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
 
@@ -276,8 +277,8 @@ ALTER TABLE ONLY persone
 
 
 --
--- TOC entry 1864 (class 2606 OID 59356)
--- Dependencies: 1530 1530
+-- TOC entry 1866 (class 2606 OID 59356)
+-- Dependencies: 1531 1531
 -- Name: struttura_indirizzi_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
 
@@ -286,8 +287,8 @@ ALTER TABLE ONLY struttura_indirizzi
 
 
 --
--- TOC entry 1860 (class 2606 OID 59339)
--- Dependencies: 1528 1528
+-- TOC entry 1862 (class 2606 OID 59339)
+-- Dependencies: 1529 1529
 -- Name: strutture_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
 
@@ -296,8 +297,8 @@ ALTER TABLE ONLY strutture
 
 
 --
--- TOC entry 1854 (class 2606 OID 59296)
--- Dependencies: 1525 1525
+-- TOC entry 1856 (class 2606 OID 59296)
+-- Dependencies: 1526 1526
 -- Name: tipi_nodo_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
 
@@ -316,8 +317,8 @@ ALTER TABLE ONLY tipi_rapporto_lavoro
 
 
 --
--- TOC entry 1856 (class 2606 OID 59303)
--- Dependencies: 1526 1526
+-- TOC entry 1858 (class 2606 OID 59303)
+-- Dependencies: 1527 1527
 -- Name: tipi_recapito_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
 
@@ -336,8 +337,8 @@ ALTER TABLE ONLY titoli
 
 
 --
--- TOC entry 1858 (class 2606 OID 59321)
--- Dependencies: 1527 1527
+-- TOC entry 1860 (class 2606 OID 59321)
+-- Dependencies: 1528 1528
 -- Name: uffici_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
 
@@ -346,8 +347,8 @@ ALTER TABLE ONLY uffici
 
 
 --
--- TOC entry 1866 (class 2606 OID 59366)
--- Dependencies: 1531 1531
+-- TOC entry 1868 (class 2606 OID 59366)
+-- Dependencies: 1532 1532
 -- Name: ufficio_nodi_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
 
@@ -356,8 +357,8 @@ ALTER TABLE ONLY ufficio_nodi
 
 
 --
--- TOC entry 1868 (class 2606 OID 59408)
--- Dependencies: 1532 1532
+-- TOC entry 1870 (class 2606 OID 59408)
+-- Dependencies: 1533 1533
 -- Name: ufficio_orari_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
 
@@ -366,8 +367,8 @@ ALTER TABLE ONLY ufficio_orari
 
 
 --
--- TOC entry 1870 (class 2606 OID 59419)
--- Dependencies: 1533 1533
+-- TOC entry 1872 (class 2606 OID 59419)
+-- Dependencies: 1534 1534
 -- Name: ufficio_recapiti_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
 
@@ -376,8 +377,8 @@ ALTER TABLE ONLY ufficio_recapiti
 
 
 --
--- TOC entry 1862 (class 2606 OID 59345)
--- Dependencies: 1529 1529
+-- TOC entry 1864 (class 2606 OID 59345)
+-- Dependencies: 1530 1530
 -- Name: vie_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
 
@@ -385,7 +386,7 @@ ALTER TABLE ONLY vie
     ADD CONSTRAINT vie_pkey PRIMARY KEY (id);
 
 
--- Completed on 2010-10-13 08:52:29
+-- Completed on 2010-10-13 10:20:10
 
 --
 -- PostgreSQL database dump complete

diff --git a/src/uffici.c b/src/uffici.c
index 5284b6655f764829461a7257b9bc2d1f45b759eb..f808bc47551479787a8715b10690596abab14a6e 100644 (file)
--- a/src/uffici.c
+++ b/src/uffici.c
@@ -164,7 +164,7 @@ Uffici
 
        if (priv->selezione)
                {
-                       gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "label7")));
+                       gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "label17")));
                        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button26"),
                                          "clicked", G_CALLBACK (uffici_on_btn_annulla_clicked), (gpointer)a);
                        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button27"),