From d32a37a025a056e0b5ce1cdcf374d205ff115178 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Wed, 29 May 2013 10:23:03 +0200 Subject: [PATCH] Aggiunti i parametri graphviz per la connessione al tipo nodo (closes #660). --- data/organigramma/form/tipo_nodo.form | 4 + data/organigramma/gui/organigramma.gui | 106 ++++++++++++---- docs/DBChangelog | 1 + docs/organigramma.sql | 163 +++++++++---------------- 4 files changed, 145 insertions(+), 129 deletions(-) diff --git a/data/organigramma/form/tipo_nodo.form b/data/organigramma/form/tipo_nodo.form index 2ab7256..01776b9 100644 --- a/data/organigramma/form/tipo_nodo.form +++ b/data/organigramma/form/tipo_nodo.form @@ -20,4 +20,8 @@ + + + + diff --git a/data/organigramma/gui/organigramma.gui b/data/organigramma/gui/organigramma.gui index 9bcd30c..0728095 100644 --- a/data/organigramma/gui/organigramma.gui +++ b/data/organigramma/gui/organigramma.gui @@ -6247,40 +6247,102 @@ - + True - True - automatic - automatic - etched-in + False + 0 - + True - True + False + 5 + 2 + 2 + 5 + 5 + + + True + False + 0 + 0 + Nodo + + + GTK_FILL + + + + + True + True + automatic + automatic + etched-in + + + True + True + + + + + 1 + 2 + + + + + True + False + 0 + 0 + Connessione + + + 1 + 2 + GTK_FILL + + + + + True + True + automatic + automatic + etched-in + + + True + True + + + + + 1 + 2 + 1 + 2 + + + + + + + True + False + <b>GraphViz</b> + True - 1 2 2 3 - - - True - False - 0 - 0 - GraphViz - - - 2 - 3 - GTK_FILL - - True diff --git a/docs/DBChangelog b/docs/DBChangelog index 9bd88e7..56bf0db 100644 --- a/docs/DBChangelog +++ b/docs/DBChangelog @@ -4,3 +4,4 @@ ALTER TABLE uffici ADD COLUMN id_uffici integer DEFAULT 0; ALTER TABLE tipi_nodo ADD COLUMN graphviz text DEFAULT ''; +ALTER TABLE tipi_nodo ADD COLUMN graphviz_connessione text DEFAULT ''; diff --git a/docs/organigramma.sql b/docs/organigramma.sql index dcc8eae..c635f23 100644 --- a/docs/organigramma.sql +++ b/docs/organigramma.sql @@ -2,31 +2,23 @@ -- PostgreSQL database dump -- --- Dumped from database version 9.1.9 --- Dumped by pg_dump version 9.1.9 --- Started on 2013-05-25 15:06:39 CEST +-- Dumped from database version 8.4.17 +-- Dumped by pg_dump version 9.2.2 +-- Started on 2013-05-29 10:22:36 SET statement_timeout = 0; SET client_encoding = 'UTF8'; -SET standard_conforming_strings = on; +SET standard_conforming_strings = off; SET check_function_bodies = false; SET client_min_messages = warning; +SET escape_string_warning = off; -- --- TOC entry 183 (class 3079 OID 11649) --- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: - +-- TOC entry 539 (class 2612 OID 16386) +-- Name: plpgsql; Type: PROCEDURAL LANGUAGE; Schema: -; Owner: - -- -CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog; - - --- --- TOC entry 2095 (class 0 OID 0) --- Dependencies: 183 --- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: - --- - -COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language'; +CREATE OR REPLACE PROCEDURAL LANGUAGE plpgsql; SET search_path = public, pg_catalog; @@ -34,8 +26,7 @@ SET search_path = public, pg_catalog; SET default_with_oids = false; -- --- TOC entry 161 (class 1259 OID 17751) --- Dependencies: 1955 1956 1957 6 +-- TOC entry 140 (class 1259 OID 59279) -- Name: nodi; Type: TABLE; Schema: public; Owner: - -- @@ -50,8 +41,7 @@ CREATE TABLE nodi ( -- --- TOC entry 162 (class 1259 OID 17760) --- Dependencies: 1958 1959 1960 1961 1962 1963 1964 1965 1966 6 +-- TOC entry 160 (class 1259 OID 61344) -- Name: persona_incarichi; Type: TABLE; Schema: public; Owner: - -- @@ -72,8 +62,7 @@ CREATE TABLE persona_incarichi ( -- --- TOC entry 163 (class 1259 OID 17775) --- Dependencies: 1967 1968 1969 1970 6 +-- TOC entry 155 (class 1259 OID 61295) -- Name: persona_nodi; Type: TABLE; Schema: public; Owner: - -- @@ -89,8 +78,7 @@ CREATE TABLE persona_nodi ( -- --- TOC entry 164 (class 1259 OID 17785) --- Dependencies: 1971 1972 1973 1974 1975 1976 1977 6 +-- TOC entry 156 (class 1259 OID 61307) -- Name: persona_nodo_recapiti; Type: TABLE; Schema: public; Owner: - -- @@ -107,8 +95,7 @@ CREATE TABLE persona_nodo_recapiti ( -- --- TOC entry 165 (class 1259 OID 17798) --- Dependencies: 1978 1979 1980 1981 1982 1983 6 +-- TOC entry 153 (class 1259 OID 61266) -- Name: persona_recapiti; Type: TABLE; Schema: public; Owner: - -- @@ -124,8 +111,7 @@ CREATE TABLE persona_recapiti ( -- --- TOC entry 166 (class 1259 OID 17810) --- Dependencies: 1984 1985 1986 1987 6 +-- TOC entry 152 (class 1259 OID 61243) -- Name: persona_uffici; Type: TABLE; Schema: public; Owner: - -- @@ -143,8 +129,7 @@ CREATE TABLE persona_uffici ( -- --- TOC entry 167 (class 1259 OID 17820) --- Dependencies: 1988 1989 1990 1991 1992 1993 1994 6 +-- TOC entry 154 (class 1259 OID 61280) -- Name: persona_ufficio_recapiti; Type: TABLE; Schema: public; Owner: - -- @@ -161,8 +146,7 @@ CREATE TABLE persona_ufficio_recapiti ( -- --- TOC entry 168 (class 1259 OID 17833) --- Dependencies: 1995 1996 1997 1998 1999 2000 2001 2002 2003 6 +-- TOC entry 150 (class 1259 OID 61227) -- Name: persone; Type: TABLE; Schema: public; Owner: - -- @@ -182,8 +166,7 @@ CREATE TABLE persone ( -- --- TOC entry 169 (class 1259 OID 17848) --- Dependencies: 2004 2005 6 +-- TOC entry 157 (class 1259 OID 61322) -- Name: posizioni_economiche; Type: TABLE; Schema: public; Owner: - -- @@ -195,8 +178,7 @@ CREATE TABLE posizioni_economiche ( -- --- TOC entry 170 (class 1259 OID 17853) --- Dependencies: 2006 2007 6 +-- TOC entry 159 (class 1259 OID 61336) -- Name: profili_professionali; Type: TABLE; Schema: public; Owner: - -- @@ -208,8 +190,7 @@ CREATE TABLE profili_professionali ( -- --- TOC entry 171 (class 1259 OID 17858) --- Dependencies: 2008 2009 2010 6 +-- TOC entry 145 (class 1259 OID 59346) -- Name: struttura_indirizzi; Type: TABLE; Schema: public; Owner: - -- @@ -224,8 +205,7 @@ CREATE TABLE struttura_indirizzi ( -- --- TOC entry 172 (class 1259 OID 17867) --- Dependencies: 2011 2012 2013 2014 2015 6 +-- TOC entry 144 (class 1259 OID 59327) -- Name: strutture; Type: TABLE; Schema: public; Owner: - -- @@ -240,8 +220,7 @@ CREATE TABLE strutture ( -- --- TOC entry 173 (class 1259 OID 17878) --- Dependencies: 2016 2017 2018 6 +-- TOC entry 141 (class 1259 OID 59290) -- Name: tipi_nodo; Type: TABLE; Schema: public; Owner: - -- @@ -249,13 +228,13 @@ CREATE TABLE tipi_nodo ( id integer NOT NULL, nome character varying(100) DEFAULT ''::character varying, status character varying(1) DEFAULT ''::character varying, - graphviz text DEFAULT ''::text + graphviz text DEFAULT ''::text, + graphviz_connessione text DEFAULT ''::text ); -- --- TOC entry 174 (class 1259 OID 17883) --- Dependencies: 2019 2020 6 +-- TOC entry 158 (class 1259 OID 61329) -- Name: tipi_prestazione; Type: TABLE; Schema: public; Owner: - -- @@ -267,8 +246,7 @@ CREATE TABLE tipi_prestazione ( -- --- TOC entry 175 (class 1259 OID 17888) --- Dependencies: 2021 2022 6 +-- TOC entry 151 (class 1259 OID 61236) -- Name: tipi_rapporto_lavoro; Type: TABLE; Schema: public; Owner: - -- @@ -280,8 +258,7 @@ CREATE TABLE tipi_rapporto_lavoro ( -- --- TOC entry 176 (class 1259 OID 17893) --- Dependencies: 2023 2024 6 +-- TOC entry 142 (class 1259 OID 59297) -- Name: tipi_recapito; Type: TABLE; Schema: public; Owner: - -- @@ -293,8 +270,7 @@ CREATE TABLE tipi_recapito ( -- --- TOC entry 177 (class 1259 OID 17898) --- Dependencies: 2025 2026 2027 6 +-- TOC entry 149 (class 1259 OID 61219) -- Name: titoli; Type: TABLE; Schema: public; Owner: - -- @@ -307,14 +283,13 @@ CREATE TABLE titoli ( -- --- TOC entry 178 (class 1259 OID 17904) --- Dependencies: 2028 2029 2030 2031 6 +-- TOC entry 143 (class 1259 OID 59311) -- Name: uffici; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE uffici ( id integer NOT NULL, - id_strutture integer, + id_strutture integer DEFAULT 0, nome character varying(100) DEFAULT ''::character varying, descrizione text DEFAULT ''::text, status character varying(1) DEFAULT ''::character varying, @@ -323,8 +298,7 @@ CREATE TABLE uffici ( -- --- TOC entry 179 (class 1259 OID 17913) --- Dependencies: 2032 2033 6 +-- TOC entry 146 (class 1259 OID 59357) -- Name: ufficio_nodi; Type: TABLE; Schema: public; Owner: - -- @@ -338,8 +312,7 @@ CREATE TABLE ufficio_nodi ( -- --- TOC entry 180 (class 1259 OID 17921) --- Dependencies: 2034 2035 6 +-- TOC entry 147 (class 1259 OID 59399) -- Name: ufficio_orari; Type: TABLE; Schema: public; Owner: - -- @@ -366,8 +339,7 @@ CREATE TABLE ufficio_orari ( -- --- TOC entry 181 (class 1259 OID 17929) --- Dependencies: 2036 2037 2038 6 +-- TOC entry 148 (class 1259 OID 59409) -- Name: ufficio_recapiti; Type: TABLE; Schema: public; Owner: - -- @@ -383,8 +355,7 @@ CREATE TABLE ufficio_recapiti ( -- --- TOC entry 182 (class 1259 OID 17938) --- Dependencies: 2039 2040 2041 2042 2043 2044 6 +-- TOC entry 161 (class 1259 OID 61417) -- Name: ufficio_stanze; Type: TABLE; Schema: public; Owner: - -- @@ -400,8 +371,7 @@ CREATE TABLE ufficio_stanze ( -- --- TOC entry 2046 (class 2606 OID 17951) --- Dependencies: 161 161 2090 +-- TOC entry 1963 (class 2606 OID 59289) -- Name: nodi_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -410,8 +380,7 @@ ALTER TABLE ONLY nodi -- --- TOC entry 2048 (class 2606 OID 17953) --- Dependencies: 162 162 2090 +-- TOC entry 2003 (class 2606 OID 61360) -- Name: persona_incarichi_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -420,8 +389,7 @@ ALTER TABLE ONLY persona_incarichi -- --- TOC entry 2050 (class 2606 OID 17955) --- Dependencies: 163 163 2090 +-- TOC entry 1993 (class 2606 OID 61305) -- Name: persona_nodi_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -430,8 +398,7 @@ ALTER TABLE ONLY persona_nodi -- --- TOC entry 2052 (class 2606 OID 17957) --- Dependencies: 164 164 2090 +-- TOC entry 1995 (class 2606 OID 61321) -- Name: persona_nodo_recapiti_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -440,8 +407,7 @@ ALTER TABLE ONLY persona_nodo_recapiti -- --- TOC entry 2054 (class 2606 OID 17959) --- Dependencies: 165 165 2090 +-- TOC entry 1989 (class 2606 OID 61279) -- Name: persona_recapiti_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -450,8 +416,7 @@ ALTER TABLE ONLY persona_recapiti -- --- TOC entry 2056 (class 2606 OID 17961) --- Dependencies: 166 166 2090 +-- TOC entry 1987 (class 2606 OID 61252) -- Name: persona_uffici_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -460,8 +425,7 @@ ALTER TABLE ONLY persona_uffici -- --- TOC entry 2058 (class 2606 OID 17963) --- Dependencies: 167 167 2090 +-- TOC entry 1991 (class 2606 OID 61294) -- Name: persona_ufficio_recapiti_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -470,8 +434,7 @@ ALTER TABLE ONLY persona_ufficio_recapiti -- --- TOC entry 2060 (class 2606 OID 17965) --- Dependencies: 168 168 2090 +-- TOC entry 1983 (class 2606 OID 61235) -- Name: persone_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -480,8 +443,7 @@ ALTER TABLE ONLY persone -- --- TOC entry 2062 (class 2606 OID 17967) --- Dependencies: 169 169 2090 +-- TOC entry 1997 (class 2606 OID 61328) -- Name: posizioni_economiche_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -490,8 +452,7 @@ ALTER TABLE ONLY posizioni_economiche -- --- TOC entry 2064 (class 2606 OID 17969) --- Dependencies: 170 170 2090 +-- TOC entry 2001 (class 2606 OID 61342) -- Name: profili_professionali_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -500,8 +461,7 @@ ALTER TABLE ONLY profili_professionali -- --- TOC entry 2066 (class 2606 OID 17971) --- Dependencies: 171 171 2090 +-- TOC entry 1973 (class 2606 OID 59356) -- Name: struttura_indirizzi_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -510,8 +470,7 @@ ALTER TABLE ONLY struttura_indirizzi -- --- TOC entry 2068 (class 2606 OID 17973) --- Dependencies: 172 172 2090 +-- TOC entry 1971 (class 2606 OID 59339) -- Name: strutture_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -520,8 +479,7 @@ ALTER TABLE ONLY strutture -- --- TOC entry 2070 (class 2606 OID 17975) --- Dependencies: 173 173 2090 +-- TOC entry 1965 (class 2606 OID 59296) -- Name: tipi_nodo_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -530,8 +488,7 @@ ALTER TABLE ONLY tipi_nodo -- --- TOC entry 2072 (class 2606 OID 17977) --- Dependencies: 174 174 2090 +-- TOC entry 1999 (class 2606 OID 61335) -- Name: tipi_prestazione_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -540,8 +497,7 @@ ALTER TABLE ONLY tipi_prestazione -- --- TOC entry 2074 (class 2606 OID 17979) --- Dependencies: 175 175 2090 +-- TOC entry 1985 (class 2606 OID 61242) -- Name: tipi_rapporto_lavoro_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -550,8 +506,7 @@ ALTER TABLE ONLY tipi_rapporto_lavoro -- --- TOC entry 2076 (class 2606 OID 17981) --- Dependencies: 176 176 2090 +-- TOC entry 1967 (class 2606 OID 59303) -- Name: tipi_recapito_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -560,8 +515,7 @@ ALTER TABLE ONLY tipi_recapito -- --- TOC entry 2078 (class 2606 OID 17983) --- Dependencies: 177 177 2090 +-- TOC entry 1981 (class 2606 OID 61226) -- Name: titoli_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -570,8 +524,7 @@ ALTER TABLE ONLY titoli -- --- TOC entry 2080 (class 2606 OID 17985) --- Dependencies: 178 178 2090 +-- TOC entry 1969 (class 2606 OID 59321) -- Name: uffici_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -580,8 +533,7 @@ ALTER TABLE ONLY uffici -- --- TOC entry 2082 (class 2606 OID 17987) --- Dependencies: 179 179 2090 +-- TOC entry 1975 (class 2606 OID 59366) -- Name: ufficio_nodi_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -590,8 +542,7 @@ ALTER TABLE ONLY ufficio_nodi -- --- TOC entry 2084 (class 2606 OID 17989) --- Dependencies: 180 180 2090 +-- TOC entry 1977 (class 2606 OID 59408) -- Name: ufficio_orari_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -600,8 +551,7 @@ ALTER TABLE ONLY ufficio_orari -- --- TOC entry 2086 (class 2606 OID 17991) --- Dependencies: 181 181 2090 +-- TOC entry 1979 (class 2606 OID 59419) -- Name: ufficio_recapiti_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -610,8 +560,7 @@ ALTER TABLE ONLY ufficio_recapiti -- --- TOC entry 2088 (class 2606 OID 17993) --- Dependencies: 182 182 2090 +-- TOC entry 2005 (class 2606 OID 61430) -- Name: ufficio_stanze_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -619,7 +568,7 @@ ALTER TABLE ONLY ufficio_stanze ADD CONSTRAINT ufficio_stanze_pkey PRIMARY KEY (id); --- Completed on 2013-05-25 15:06:40 CEST +-- Completed on 2013-05-29 10:22:37 -- -- PostgreSQL database dump complete -- 2.49.0