# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1275957424 -7200
# Node ID 2b6107e510d8e86d736eaa8ec9f99ab46c040048
# Parent  d47f6a75d20e024faf843170a3143d55047f890f
výpis komentářů

diff -r d47f6a75d20e -r 2b6107e510d8 java/nekurak.net-ejb/src/conf/Komentar.hbm.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-ejb/src/conf/Komentar.hbm.xml	Tue Jun 08 02:37:04 2010 +0200
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+    <class name="cz.frantovo.nekurak.dto.Komentar" table="komentar">
+	<id name="id" column="id" type="integer">
+	    <generator class="sequence">
+		<param name="sequence">komentar_seq</param>
+	    </generator>
+	</id>
+	<property name="podnik" column="podnik"/>
+	<property name="uzivatel" column="uzivatel"/>
+	<property name="datum" column="datum"/>
+	<property name="nadpis" column="nadpis"/>
+	<property name="komentar" column="komentar"/>
+    </class>
+</hibernate-mapping>
\ No newline at end of file
diff -r d47f6a75d20e -r 2b6107e510d8 java/nekurak.net-ejb/src/conf/Podnik.hbm.xml
--- a/java/nekurak.net-ejb/src/conf/Podnik.hbm.xml	Mon Jun 07 23:14:02 2010 +0200
+++ b/java/nekurak.net-ejb/src/conf/Podnik.hbm.xml	Tue Jun 08 02:37:04 2010 +0200
@@ -21,6 +21,10 @@
 	    <list-index column="poradi"/>
 	    <one-to-many class="cz.frantovo.nekurak.dto.Fotka"/>
 	</list>
+	<set name="komentare" table="komentar" lazy="false">
+	    <key column="podnik" foreign-key="id"/>
+	    <one-to-many class="cz.frantovo.nekurak.dto.Komentar"/>
+	</set>
 	<property name="sirka" column="sirka"/>
 	<property name="delka" column="delka"/>
 
diff -r d47f6a75d20e -r 2b6107e510d8 java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Komentar.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Komentar.java	Tue Jun 08 02:37:04 2010 +0200
@@ -0,0 +1,65 @@
+package cz.frantovo.nekurak.dto;
+
+import java.util.Date;
+
+/**
+ * Komentář k podniku
+ * @author fiki
+ */
+public class Komentar {
+
+    private int id;
+    private int podnik;
+    private String uzivatel;
+    private Date datum;
+    private String nadpis;
+    private String komentar;
+
+    public int getId() {
+	return id;
+    }
+
+    public void setId(int id) {
+	this.id = id;
+    }
+
+    public int getPodnik() {
+	return podnik;
+    }
+
+    public void setPodnik(int podnik) {
+	this.podnik = podnik;
+    }
+
+    public String getUzivatel() {
+	return uzivatel;
+    }
+
+    public void setUzivatel(String uzivatel) {
+	this.uzivatel = uzivatel;
+    }
+
+    public Date getDatum() {
+	return datum;
+    }
+
+    public void setDatum(Date datum) {
+	this.datum = datum;
+    }
+
+    public String getNadpis() {
+	return nadpis;
+    }
+
+    public void setNadpis(String nadpis) {
+	this.nadpis = nadpis;
+    }
+
+    public String getKomentar() {
+	return komentar;
+    }
+
+    public void setKomentar(String komentar) {
+	this.komentar = komentar;
+    }
+}
diff -r d47f6a75d20e -r 2b6107e510d8 java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Podnik.java
--- a/java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Podnik.java	Mon Jun 07 23:14:02 2010 +0200
+++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Podnik.java	Tue Jun 08 02:37:04 2010 +0200
@@ -3,7 +3,9 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Podnik – hospoda, bar, kavárna…
@@ -21,6 +23,7 @@
     private String mesto;
     private String spravce;
     private List<Fotka> fotky = new ArrayList<Fotka>();
+    private Set<Komentar> komentare = new HashSet<Komentar>();
     private Double sirka;
     private Double delka;
 
@@ -127,4 +130,12 @@
     public void setDelka(Double delka) {
 	this.delka = delka;
     }
+
+    public Set<Komentar> getKomentare() {
+	return komentare;
+    }
+
+    public void setKomentare(Set<Komentar> komentare) {
+	this.komentare = komentare;
+    }
 }
diff -r d47f6a75d20e -r 2b6107e510d8 java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties
--- a/java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties	Mon Jun 07 23:14:02 2010 +0200
+++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties	Tue Jun 08 02:37:04 2010 +0200
@@ -81,8 +81,8 @@
 hlasovani.TODO=TODO: lokalizovat Javascript
 
 komentare.vypisNadpis=Koment\u00E1\u0159e k tomuto podniku
-komentare.=
-komentare.=
+komentare.prihlasitSe=Pro vkl\u00E1d\u00E1n\u00ED koment\u00E1\u0159\u016F se pros\u00EDm p\u0159ihla\u0161te.
+komentare.zadneKomentare=Zat\u00EDm nikdo nekomentoval.
 komentare.=
 komentare.=
 komentare.=
diff -r d47f6a75d20e -r 2b6107e510d8 java/nekurak.net-web/web/WEB-INF/tags/nekurak/komentareVypis.tag
--- a/java/nekurak.net-web/web/WEB-INF/tags/nekurak/komentareVypis.tag	Mon Jun 07 23:14:02 2010 +0200
+++ b/java/nekurak.net-web/web/WEB-INF/tags/nekurak/komentareVypis.tag	Tue Jun 08 02:37:04 2010 +0200
@@ -12,14 +12,31 @@
 	<h3><fmt:message key="komentare.vypisNadpis"/></h3>
 	<c:choose>
 	    <c:when test="${prihlasenyUzivatel == null}">
-		<p>pro vkládání komentářů se prosím přihlašte</p>
+		<p><fmt:message key="komentare.prihlasitSe"/></p>
 	    </c:when>
 	    <c:otherwise>
 		<p>Uživatel: <c:out value="${prihlasenyUzivatel}" /></p>
 	    </c:otherwise>
 	</c:choose>
 
+	<c:if test="${fn:length(podnik.komentare) == 0}">
+	    <p><fmt:message key="komentare.zadneKomentare"/></p>
+	</c:if>
 
+
+
+	<c:forEach var="k" items="${podnik.komentare}">
+	    <div class="komentar">
+		<h4>
+		    Napsal: <c:out value="${k.uzivatel}" />,
+		    <fmt:formatDate value="${k.datum}" pattern="dd. MMMM yyyy HH:mm"/>
+		    <br/>
+		    Předmět: <c:out value="${k.nadpis}" />
+		</h4>
+		<!-- Pozor: předpokládáme, že v DB jsou pouze zkontrolovaná data -->
+		<c:out value="${k.komentar}" escapeXml="false" />
+	    </div>
+	</c:forEach>
     </div>
 
 </jsp:root>
\ No newline at end of file
diff -r d47f6a75d20e -r 2b6107e510d8 java/nekurak.net-web/web/styl.css
--- a/java/nekurak.net-web/web/styl.css	Mon Jun 07 23:14:02 2010 +0200
+++ b/java/nekurak.net-web/web/styl.css	Tue Jun 08 02:37:04 2010 +0200
@@ -211,4 +211,21 @@
 
 .komentare {
     border-top: 1px dashed silver;
+    margin-bottom: 8px;
 }
+
+.komentar {
+    border-top: 1px solid #e7e6e6;
+}
+
+.komentar h4 {
+    font-size: medium;
+    font-weight: bold;
+    margin-top: 8px;
+    margin-bottom: 0px;
+}
+
+.komentar p {
+    margin-top: 8px;
+    margin-bottom: 8px;
+}
\ No newline at end of file