From 2274011fad600cdfa96ec71c976a5ee17c81e615 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Tue, 17 Aug 2010 15:10:37 +0200 Subject: [PATCH] Aggiunto da/a data in orario ufficio. Manacavano le ore in orario ufficio. Aggiunto campo privato (non visibile su internet) nei recapiti ufficio. --- data/organigramma/form/ufficio_orario.form | 28 + data/organigramma/form/ufficio_recapito.form | 4 + data/organigramma/gui/organigramma.gui | 1016 +++++++++++++++++- docs/organigramma.sql | 25 +- src/ufficio.c | 1 + 5 files changed, 1038 insertions(+), 36 deletions(-) diff --git a/data/organigramma/form/ufficio_orario.form b/data/organigramma/form/ufficio_orario.form index 8f53a20..a02ff04 100644 --- a/data/organigramma/form/ufficio_orario.form +++ b/data/organigramma/form/ufficio_orario.form @@ -19,6 +19,20 @@ + + + date + %d/%m/%Y + + + + + + date + %d/%m/%Y + + + @@ -60,4 +74,18 @@ + + + time + %H.%M + + + + + + time + %H.%M + + + diff --git a/data/organigramma/form/ufficio_recapito.form b/data/organigramma/form/ufficio_recapito.form index 07e2caa..96f41a1 100644 --- a/data/organigramma/form/ufficio_recapito.form +++ b/data/organigramma/form/ufficio_recapito.form @@ -33,4 +33,8 @@ + + + + diff --git a/data/organigramma/gui/organigramma.gui b/data/organigramma/gui/organigramma.gui index 57bd823..6c8e938 100644 --- a/data/organigramma/gui/organigramma.gui +++ b/data/organigramma/gui/organigramma.gui @@ -2598,7 +2598,7 @@ True - 4 + 5 2 5 5 @@ -2654,8 +2654,8 @@ lbl_id - 3 - 4 + 4 + 5 GTK_FILL GTK_FILL @@ -2667,8 +2667,8 @@ 1 2 - 3 - 4 + 4 + 5 @@ -2713,6 +2713,35 @@ 1 2 + GTK_FILL + + + + + True + 0 + Privato + + + 3 + 4 + GTK_FILL + GTK_FILL + + + + + True + True + False + True + + + 1 + 2 + 3 + 4 + GTK_FILL @@ -3068,7 +3097,7 @@ True - 6 + 10 2 5 5 @@ -3109,8 +3138,8 @@ lbl_id - 5 - 6 + 9 + 10 GTK_FILL GTK_FILL @@ -3122,8 +3151,8 @@ 1 2 - 5 - 6 + 9 + 10 @@ -3133,8 +3162,8 @@ Giorno della settimana - 1 - 2 + 3 + 4 GTK_FILL GTK_FILL @@ -3293,8 +3322,8 @@ 1 2 - 1 - 2 + 3 + 4 GTK_FILL @@ -3305,8 +3334,8 @@ Settimana - 2 - 3 + 4 + 5 GTK_FILL GTK_FILL @@ -3318,8 +3347,8 @@ Giorno del mese - 3 - 4 + 5 + 6 GTK_FILL GTK_FILL @@ -3331,8 +3360,8 @@ Mese - 4 - 5 + 6 + 7 GTK_FILL GTK_FILL @@ -3351,8 +3380,8 @@ 1 2 - 4 - 5 + 6 + 7 GTK_FILL @@ -3366,8 +3395,8 @@ 1 2 - 2 - 3 + 4 + 5 @@ -3380,8 +3409,120 @@ 1 2 - 3 - 4 + 5 + 6 + + + + + True + 0 + Da data + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + True + 10 + ● + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + 0 + A data + + + 2 + 3 + GTK_FILL + GTK_FILL + + + + + True + True + 10 + ● + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + True + 0 + Da ora + + + 7 + 8 + GTK_FILL + GTK_FILL + + + + + True + 0 + A ora + + + 8 + 9 + GTK_FILL + GTK_FILL + + + + + True + True + 5 + ● + + + 1 + 2 + 7 + 8 + GTK_FILL + + + + + True + True + 5 + ● + + + 1 + 2 + 8 + 9 + GTK_FILL @@ -3441,4 +3582,827 @@ 1 10 + + Persona - Gestione organigramma + True + center-on-parent + True + + + True + 5 + vertical + 5 + + + True + 6 + 2 + 5 + 5 + + + True + 0 + Nome + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + True + 100 + ● + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + 0 + 0 + Descrizione + + + 4 + 5 + GTK_FILL + GTK_FILL + + + + + True + True + automatic + automatic + etched-in + + + True + True + + + + + 1 + 2 + 4 + 5 + + + + + True + 0 + lbl_id + + + 1 + 2 + GTK_FILL + + + + + True + 0 + ID + + + GTK_FILL + GTK_FILL + + + + + True + 0 + Cognome + + + 2 + 3 + GTK_FILL + GTK_FILL + + + + + True + True + ● + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + True + 0 + Titolo + + + 3 + 4 + GTK_FILL + GTK_FILL + + + + + True + + + 1 + 2 + 3 + 4 + GTK_FILL + + + + + True + True + + + True + vertical + + + True + 0 + + + True + 12 + + + True + 5 + + + True + True + automatic + automatic + etched-in + + + True + True + lstore_struttura_indirizzi + False + 0 + + + Indirizzo + + + + 1 + + + + + + + + + 0 + + + + + True + 5 + start + + + gtk-new + True + True + True + True + + + False + False + 0 + + + + + gtk-edit + True + True + True + True + + + False + False + 1 + + + + + gtk-delete + True + True + True + True + + + False + False + 2 + + + + + False + 1 + + + + + + + + + True + <b>Nodi</b> + True + + + + + 0 + + + + + True + 0 + + + True + 12 + + + True + 5 + + + True + True + automatic + automatic + etched-in + + + True + True + lstore_struttura_indirizzi + False + 0 + + + Indirizzo + + + + 1 + + + + + + + + + 0 + + + + + True + 5 + start + + + gtk-new + True + True + True + True + + + False + False + 0 + + + + + gtk-edit + True + True + True + True + + + False + False + 1 + + + + + gtk-delete + True + True + True + True + + + False + False + 2 + + + + + False + 1 + + + + + + + + + True + <b>Recapiti</b> + True + + + + + 1 + + + + + + + True + Nodi + + + False + + + + + True + vertical + + + True + 0 + + + True + 12 + + + True + 5 + + + True + True + automatic + automatic + etched-in + + + True + True + lstore_struttura_indirizzi + False + 0 + + + Indirizzo + + + + 1 + + + + + + + + + 0 + + + + + True + 5 + start + + + gtk-new + True + True + True + True + + + False + False + 0 + + + + + gtk-edit + True + True + True + True + + + False + False + 1 + + + + + gtk-delete + True + True + True + True + + + False + False + 2 + + + + + False + 1 + + + + + + + + + True + <b>Uffici</b> + True + + + + + 0 + + + + + True + 0 + + + True + 12 + + + True + 5 + + + True + True + automatic + automatic + etched-in + + + True + True + lstore_struttura_indirizzi + False + 0 + + + Indirizzo + + + + 1 + + + + + + + + + 0 + + + + + True + 5 + start + + + gtk-new + True + True + True + True + + + False + False + 0 + + + + + gtk-edit + True + True + True + True + + + False + False + 1 + + + + + gtk-delete + True + True + True + True + + + False + False + 2 + + + + + False + 1 + + + + + + + + + True + <b>Recapiti</b> + True + + + + + 1 + + + + + 1 + + + + + True + Uffici + + + 1 + False + + + + + True + 0 + + + True + 12 + + + True + 5 + + + True + True + automatic + automatic + etched-in + + + True + True + lstore_struttura_indirizzi + False + 0 + + + Indirizzo + + + + 1 + + + + + + + + + 0 + + + + + True + 5 + start + + + gtk-new + True + True + True + True + + + False + False + 0 + + + + + gtk-edit + True + True + True + True + + + False + False + 1 + + + + + gtk-delete + True + True + True + True + + + False + False + 2 + + + + + False + 1 + + + + + + + + + True + <b>Recapiti</b> + True + + + + + 2 + + + + + True + Recapiti generici + + + 2 + False + + + + + 2 + 5 + 6 + + + + + 0 + + + + + True + 5 + end + + + gtk-cancel + True + True + True + True + + + False + False + 0 + + + + + gtk-save + True + True + True + True + + + False + False + 1 + + + + + False + 1 + + + + + diff --git a/docs/organigramma.sql b/docs/organigramma.sql index d9ea10d..f62267c 100644 --- a/docs/organigramma.sql +++ b/docs/organigramma.sql @@ -2,7 +2,7 @@ -- PostgreSQL database dump -- --- Started on 2010-08-16 13:44:54 +-- Started on 2010-08-17 15:07:46 SET statement_timeout = 0; SET client_encoding = 'UTF8'; @@ -147,8 +147,8 @@ CREATE TABLE ufficio_nodi ( -- --- TOC entry 1525 (class 1259 OID 59378) --- Dependencies: 1827 1828 3 +-- TOC entry 1524 (class 1259 OID 59399) +-- Dependencies: 1824 1825 3 -- Name: ufficio_orari; Type: TABLE; Schema: public; Owner: -; Tablespace: -- @@ -156,6 +156,8 @@ CREATE TABLE ufficio_orari ( id integer NOT NULL, id_uffici integer, descrizione text DEFAULT ''::text, + da_data date, + a_data date, lunedi boolean, martedi boolean, mercoledi boolean, @@ -166,13 +168,15 @@ CREATE TABLE ufficio_orari ( settimana integer, giorno_mese integer, mese integer, + da_ora time without time zone, + a_ora time without time zone, status character varying(1) DEFAULT ''::character varying ); -- --- TOC entry 1524 (class 1259 OID 59367) --- Dependencies: 1824 1825 1826 3 +-- TOC entry 1525 (class 1259 OID 59409) +-- Dependencies: 1826 1827 1828 3 -- Name: ufficio_recapiti; Type: TABLE; Schema: public; Owner: -; Tablespace: -- @@ -182,6 +186,7 @@ CREATE TABLE ufficio_recapiti ( id_tipi_recapito integer, recapito character varying(100) DEFAULT ''::character varying, note text DEFAULT ''::text, + privato boolean, status character varying(1) DEFAULT ''::character varying ); @@ -269,8 +274,8 @@ ALTER TABLE ONLY ufficio_nodi -- --- TOC entry 1848 (class 2606 OID 59387) --- Dependencies: 1525 1525 +-- TOC entry 1846 (class 2606 OID 59408) +-- Dependencies: 1524 1524 -- Name: ufficio_orari_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: -- @@ -279,8 +284,8 @@ ALTER TABLE ONLY ufficio_orari -- --- TOC entry 1846 (class 2606 OID 59377) --- Dependencies: 1524 1524 +-- TOC entry 1848 (class 2606 OID 59419) +-- Dependencies: 1525 1525 -- Name: ufficio_recapiti_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: -- @@ -310,7 +315,7 @@ GRANT ALL ON SCHEMA public TO postgres; GRANT ALL ON SCHEMA public TO PUBLIC; --- Completed on 2010-08-16 13:44:55 +-- Completed on 2010-08-17 15:07:46 -- -- PostgreSQL database dump complete diff --git a/src/ufficio.c b/src/ufficio.c index 423b9f9..c7108af 100644 --- a/src/ufficio.c +++ b/src/ufficio.c @@ -310,6 +310,7 @@ ufficio_carica (Ufficio *ufficio) { ufficio_carica_nodi (ufficio); ufficio_carica_recapiti (ufficio); + ufficio_carica_orari (ufficio); } } -- 2.49.0