# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1268746385 -3600
# Node ID 81c64c582a26e1cf645429e0447deaca9badf8a7
# Parent  3829d619369c35c46fbd2c7a5f68b0d0659316d8
Fotky se budou zobrazovat v určitém pořadí – podle hodnoty sloupce „poradi“
Hibernate: Set → List
SQL: podnik a pořadí v tabulce fotek musí být jedinečné
TODO: používat složený klíč?

diff -r 3829d619369c -r 81c64c582a26 java/nekurak.net-ejb/src/conf/Fotka.hbm.xml
--- a/java/nekurak.net-ejb/src/conf/Fotka.hbm.xml	Tue Mar 16 14:13:14 2010 +0100
+++ b/java/nekurak.net-ejb/src/conf/Fotka.hbm.xml	Tue Mar 16 14:33:05 2010 +0100
@@ -9,5 +9,6 @@
 	    </generator>
 	</id>
 	<property name="popis" column="popis"/>
+	<property name="poradi" column="poradi"/>
     </class>
 </hibernate-mapping>
\ No newline at end of file
diff -r 3829d619369c -r 81c64c582a26 java/nekurak.net-ejb/src/conf/Podnik.hbm.xml
--- a/java/nekurak.net-ejb/src/conf/Podnik.hbm.xml	Tue Mar 16 14:13:14 2010 +0100
+++ b/java/nekurak.net-ejb/src/conf/Podnik.hbm.xml	Tue Mar 16 14:33:05 2010 +0100
@@ -16,10 +16,11 @@
 	<property name="cisloPopisne" column="cislo_popisne"/>
 	<property name="mesto" column="mesto"/>
 	<property name="spravce" column="spravce"/>
-	<set name="fotky" table="fotka" lazy="false">
+	<list name="fotky" table="fotka" lazy="false">
 	    <key column="podnik" foreign-key="id"/>
+	    <list-index column="poradi"/>
 	    <one-to-many class="cz.frantovo.nekurak.dto.Fotka"/>
-	</set>
+	</list>
 
     </class>
 </hibernate-mapping>
\ No newline at end of file
diff -r 3829d619369c -r 81c64c582a26 java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Fotka.java
--- a/java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Fotka.java	Tue Mar 16 14:13:14 2010 +0100
+++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Fotka.java	Tue Mar 16 14:33:05 2010 +0100
@@ -5,6 +5,7 @@
     /** číslo odpovídá názvu souboru na disku (+přípona) */
     private int id;
     private String popis;
+    private int poradi;
 
     public int getId() {
 	return id;
@@ -21,4 +22,12 @@
     public void setPopis(String popis) {
 	this.popis = popis;
     }
+
+    public int getPoradi() {
+	return poradi;
+    }
+
+    public void setPoradi(int poradi) {
+	this.poradi = poradi;
+    }
 }
diff -r 3829d619369c -r 81c64c582a26 java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Podnik.java
--- a/java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Podnik.java	Tue Mar 16 14:13:14 2010 +0100
+++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Podnik.java	Tue Mar 16 14:33:05 2010 +0100
@@ -1,8 +1,9 @@
 package cz.frantovo.nekurak.dto;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -20,7 +21,7 @@
     private int cisloPopisne;
     private String mesto;
     private String spravce;
-    private Set<Fotka> fotky = new HashSet<Fotka>();
+    private List<Fotka> fotky = new ArrayList<Fotka>();
 
     public Podnik() {
     }
@@ -102,11 +103,11 @@
 	this.spravce = spravce;
     }
 
-    public Set<Fotka> getFotky() {
+    public List<Fotka> getFotky() {
 	return fotky;
     }
 
-    public void setFotky(Set<Fotka> fotky) {
+    public void setFotky(List<Fotka> fotky) {
 	this.fotky = fotky;
     }
 }
diff -r 3829d619369c -r 81c64c582a26 sql/schéma.sql
--- a/sql/schéma.sql	Tue Mar 16 14:13:14 2010 +0100
+++ b/sql/schéma.sql	Tue Mar 16 14:33:05 2010 +0100
@@ -2,7 +2,7 @@
 -- PostgreSQL database dump
 --
 
--- Started on 2010-03-16 14:11:16 CET
+-- Started on 2010-03-16 14:32:22 CET
 
 SET statement_timeout = 0;
 SET client_encoding = 'UTF8';
@@ -36,7 +36,7 @@
 ALTER DOMAIN nekurak.email OWNER TO nekurak;
 
 --
--- TOC entry 1892 (class 0 OID 0)
+-- TOC entry 1894 (class 0 OID 0)
 -- Dependencies: 368
 -- Name: DOMAIN email; Type: COMMENT; Schema: nekurak; Owner: nekurak
 --
@@ -46,7 +46,7 @@
 
 --
 -- TOC entry 65 (class 1255 OID 35124)
--- Dependencies: 395 10
+-- Dependencies: 10 395
 -- Name: bezny_uzivatel(); Type: FUNCTION; Schema: nekurak; Owner: nekurak
 --
 
@@ -64,7 +64,7 @@
 ALTER FUNCTION nekurak.bezny_uzivatel() OWNER TO nekurak;
 
 --
--- TOC entry 1893 (class 0 OID 0)
+-- TOC entry 1895 (class 0 OID 0)
 -- Dependencies: 65
 -- Name: FUNCTION bezny_uzivatel(); Type: COMMENT; Schema: nekurak; Owner: nekurak
 --
@@ -109,7 +109,7 @@
 ALTER TABLE nekurak.fotka OWNER TO nekurak;
 
 --
--- TOC entry 1895 (class 0 OID 0)
+-- TOC entry 1897 (class 0 OID 0)
 -- Dependencies: 1593
 -- Name: TABLE fotka; Type: COMMENT; Schema: nekurak; Owner: nekurak
 --
@@ -118,7 +118,7 @@
 
 
 --
--- TOC entry 1896 (class 0 OID 0)
+-- TOC entry 1898 (class 0 OID 0)
 -- Dependencies: 1593
 -- Name: COLUMN fotka.poradi; Type: COMMENT; Schema: nekurak; Owner: nekurak
 --
@@ -145,7 +145,7 @@
 ALTER TABLE nekurak.hlasovani OWNER TO nekurak;
 
 --
--- TOC entry 1898 (class 0 OID 0)
+-- TOC entry 1900 (class 0 OID 0)
 -- Dependencies: 1587
 -- Name: COLUMN hlasovani.hlas; Type: COMMENT; Schema: nekurak; Owner: nekurak
 --
@@ -194,7 +194,7 @@
 ALTER TABLE nekurak.podnik OWNER TO nekurak;
 
 --
--- TOC entry 1901 (class 0 OID 0)
+-- TOC entry 1903 (class 0 OID 0)
 -- Dependencies: 1586
 -- Name: COLUMN podnik.spravce; Type: COMMENT; Schema: nekurak; Owner: nekurak
 --
@@ -217,7 +217,7 @@
 ALTER TABLE nekurak.role OWNER TO nekurak;
 
 --
--- TOC entry 1903 (class 0 OID 0)
+-- TOC entry 1905 (class 0 OID 0)
 -- Dependencies: 1590
 -- Name: TABLE role; Type: COMMENT; Schema: nekurak; Owner: nekurak
 --
@@ -260,7 +260,7 @@
 ALTER TABLE nekurak.uzivatel OWNER TO nekurak;
 
 --
--- TOC entry 1906 (class 0 OID 0)
+-- TOC entry 1908 (class 0 OID 0)
 -- Dependencies: 1589
 -- Name: COLUMN uzivatel.prezdivka; Type: COMMENT; Schema: nekurak; Owner: nekurak
 --
@@ -283,7 +283,7 @@
 ALTER TABLE nekurak.uzivatel_role OWNER TO nekurak;
 
 --
--- TOC entry 1908 (class 0 OID 0)
+-- TOC entry 1910 (class 0 OID 0)
 -- Dependencies: 1591
 -- Name: TABLE uzivatel_role; Type: COMMENT; Schema: nekurak; Owner: nekurak
 --
@@ -302,6 +302,16 @@
 
 
 --
+-- TOC entry 1884 (class 2606 OID 35204)
+-- Dependencies: 1593 1593 1593
+-- Name: fotka_poradi_uq; Type: CONSTRAINT; Schema: nekurak; Owner: nekurak; Tablespace: 
+--
+
+ALTER TABLE ONLY fotka
+    ADD CONSTRAINT fotka_poradi_uq UNIQUE (popis, poradi);
+
+
+--
 -- TOC entry 1872 (class 2606 OID 35058)
 -- Dependencies: 1586 1586
 -- Name: podnik_pk; Type: CONSTRAINT; Schema: nekurak; Owner: nekurak; Tablespace: 
@@ -352,8 +362,8 @@
 
 
 --
--- TOC entry 1888 (class 2620 OID 35125)
--- Dependencies: 65 1589
+-- TOC entry 1890 (class 2620 OID 35125)
+-- Dependencies: 1589 65
 -- Name: uzivatel_insert; Type: TRIGGER; Schema: nekurak; Owner: nekurak
 --
 
@@ -364,8 +374,8 @@
 
 
 --
--- TOC entry 1887 (class 2606 OID 35191)
--- Dependencies: 1871 1593 1586
+-- TOC entry 1889 (class 2606 OID 35191)
+-- Dependencies: 1871 1586 1593
 -- Name: fotka_podnik_fk; Type: FK CONSTRAINT; Schema: nekurak; Owner: nekurak
 --
 
@@ -374,8 +384,8 @@
 
 
 --
--- TOC entry 1884 (class 2606 OID 35072)
--- Dependencies: 1871 1586 1587
+-- TOC entry 1886 (class 2606 OID 35072)
+-- Dependencies: 1587 1871 1586
 -- Name: hlasovani_podnik_fk; Type: FK CONSTRAINT; Schema: nekurak; Owner: nekurak
 --
 
@@ -384,7 +394,7 @@
 
 
 --
--- TOC entry 1883 (class 2606 OID 35178)
+-- TOC entry 1885 (class 2606 OID 35178)
 -- Dependencies: 1875 1589 1586
 -- Name: podnik_uzivatel_fk; Type: FK CONSTRAINT; Schema: nekurak; Owner: nekurak
 --
@@ -394,7 +404,7 @@
 
 
 --
--- TOC entry 1885 (class 2606 OID 35138)
+-- TOC entry 1887 (class 2606 OID 35138)
 -- Dependencies: 1590 1591 1877
 -- Name: uzivatel_role_role_fk; Type: FK CONSTRAINT; Schema: nekurak; Owner: nekurak
 --
@@ -404,7 +414,7 @@
 
 
 --
--- TOC entry 1886 (class 2606 OID 35143)
+-- TOC entry 1888 (class 2606 OID 35143)
 -- Dependencies: 1591 1589 1875
 -- Name: uzivatel_role_uzivatel_fk; Type: FK CONSTRAINT; Schema: nekurak; Owner: nekurak
 --
@@ -414,7 +424,7 @@
 
 
 --
--- TOC entry 1891 (class 0 OID 0)
+-- TOC entry 1893 (class 0 OID 0)
 -- Dependencies: 10
 -- Name: nekurak; Type: ACL; Schema: -; Owner: nekurak
 --
@@ -426,7 +436,7 @@
 
 
 --
--- TOC entry 1894 (class 0 OID 0)
+-- TOC entry 1896 (class 0 OID 0)
 -- Dependencies: 1592
 -- Name: fotka_seq; Type: ACL; Schema: nekurak; Owner: nekurak
 --
@@ -438,7 +448,7 @@
 
 
 --
--- TOC entry 1897 (class 0 OID 0)
+-- TOC entry 1899 (class 0 OID 0)
 -- Dependencies: 1593
 -- Name: fotka; Type: ACL; Schema: nekurak; Owner: nekurak
 --
@@ -450,7 +460,7 @@
 
 
 --
--- TOC entry 1899 (class 0 OID 0)
+-- TOC entry 1901 (class 0 OID 0)
 -- Dependencies: 1587
 -- Name: hlasovani; Type: ACL; Schema: nekurak; Owner: nekurak
 --
@@ -462,7 +472,7 @@
 
 
 --
--- TOC entry 1900 (class 0 OID 0)
+-- TOC entry 1902 (class 0 OID 0)
 -- Dependencies: 1585
 -- Name: podnik_seq; Type: ACL; Schema: nekurak; Owner: nekurak
 --
@@ -474,7 +484,7 @@
 
 
 --
--- TOC entry 1902 (class 0 OID 0)
+-- TOC entry 1904 (class 0 OID 0)
 -- Dependencies: 1586
 -- Name: podnik; Type: ACL; Schema: nekurak; Owner: nekurak
 --
@@ -486,7 +496,7 @@
 
 
 --
--- TOC entry 1904 (class 0 OID 0)
+-- TOC entry 1906 (class 0 OID 0)
 -- Dependencies: 1590
 -- Name: role; Type: ACL; Schema: nekurak; Owner: nekurak
 --
@@ -498,7 +508,7 @@
 
 
 --
--- TOC entry 1905 (class 0 OID 0)
+-- TOC entry 1907 (class 0 OID 0)
 -- Dependencies: 1588
 -- Name: uzivatel_seq; Type: ACL; Schema: nekurak; Owner: nekurak
 --
@@ -510,7 +520,7 @@
 
 
 --
--- TOC entry 1907 (class 0 OID 0)
+-- TOC entry 1909 (class 0 OID 0)
 -- Dependencies: 1589
 -- Name: uzivatel; Type: ACL; Schema: nekurak; Owner: nekurak
 --
@@ -522,7 +532,7 @@
 
 
 --
--- TOC entry 1909 (class 0 OID 0)
+-- TOC entry 1911 (class 0 OID 0)
 -- Dependencies: 1591
 -- Name: uzivatel_role; Type: ACL; Schema: nekurak; Owner: nekurak
 --
@@ -533,7 +543,7 @@
 GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE uzivatel_role TO nekurak_web;
 
 
--- Completed on 2010-03-16 14:11:18 CET
+-- Completed on 2010-03-16 14:32:24 CET
 
 --
 -- PostgreSQL database dump complete