# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1234481219 -3600
# Node ID 90dc76051e5675484978989ad3c42b01478afa2c
# Parent  b5dd3de618cdf5b7ad80fbf86d834ffe0358670f
Výměnna proměnných mezi JSP a beanou
JavaScript pro zobrazování a skrývání seznamu cílů
Formulář pro výběr data a cíle

diff -r b5dd3de618cd -r 90dc76051e56 java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/DenniSouhrn.java
--- a/java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/DenniSouhrn.java	Thu Feb 12 21:17:09 2009 +0100
+++ b/java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/DenniSouhrn.java	Fri Feb 13 00:26:59 2009 +0100
@@ -23,11 +23,19 @@
     private static final long serialVersionUID = 7932392366943861342L;
     private static final Logger log = Logger.getLogger(DenniSouhrn.class.getName());
     private static final long DEN = 1000 * 60 * 60 * 24;
-    private static String formatDataVzor = "yyyy-mm-dd";
+    private static String formatDataVzor = "yyyy-MM-dd";
     public static DateFormat formatData = new SimpleDateFormat(formatDataVzor);
     private Date den;
+    private int cil;
+
+    public String getDenString() {
+        return formatData.format(getDen());
+    }
 
     public Date getDen() {
+        if (den == null) {
+            nastavVychoziDen();
+        }
         return den;
     }
 
@@ -37,22 +45,42 @@
         } else {
             this.den = den;
         }
-        log.log(Level.INFO, "Den nastaven na: " + formatData.format(den));
+        log.log(Level.FINE, "Den nastaven na: " + formatData.format(den));
     }
 
-    public void setDen(String den) {
-        if (den == null || den.length() != formatDataVzor.length()) {
+    public void setDenString(String den) {
+        if (den == null) {
             nastavVychoziDen();
         }
 
         try {
             this.den = new Date(formatData.parse(den).getTime());
         } catch (ParseException e) {
-            log.log(Level.INFO, "Chybně zadané datum: " + den, e);
+            log.log(Level.FINE, "Chybně zadané datum: " + den, e);
             nastavVychoziDen();
         }
     }
 
+    public void setCilString(String cil) {
+        try {
+            this.cil = Integer.parseInt(cil);
+        } catch (Exception e) {
+            this.cil = 0;
+        }
+    }
+
+    public void setCil(int cil) {
+        this.cil = cil;
+    }
+
+    public String getCilString() {
+        return String.valueOf(cil);
+    }
+
+    public int getCil() {
+        return cil;
+    }
+
     /**
      * Ve výchozím stavu zobrazujeme souhrn za předešlý den.
      * @return včerejšek
@@ -62,17 +90,17 @@
     }
 
     private void nastavVychoziDen() {
-        log.log(Level.INFO, "Nastavuji den na výchozí hodnotu.");
+        log.log(Level.FINE, "Nastavuji den na výchozí hodnotu.");
         setDen(getVychoziDen());
     }
 
     public Collection<Souhrn> getSouhrn() {
         Collection<Souhrn> souhrn = new ArrayList<Souhrn>();
 
-        Cil cil = new Cil(1, "Frantovo.cz", "http://frantovo.cz/blog/", null, null);
+        Cil c = new Cil(1, "Frantovo.cz", "http://frantovo.cz/blog/", null, null);
 
         for (int i = 1; i < 11; i++) {
-            Souhrn s = new Souhrn(getVychoziDen(), new SitovaAdresa("10.0.0.8", i + ".frantovo.cz"), 100 + i, cil);
+            Souhrn s = new Souhrn(getVychoziDen(), new SitovaAdresa("10.0.0.8", i + ".frantovo.cz"), 100 + i, c);
             souhrn.add(s);
         }
 
diff -r b5dd3de618cd -r 90dc76051e56 java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/dao/HrisniciSuperDAO.java
--- a/java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/dao/HrisniciSuperDAO.java	Thu Feb 12 21:17:09 2009 +0100
+++ b/java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/dao/HrisniciSuperDAO.java	Fri Feb 13 00:26:59 2009 +0100
@@ -46,7 +46,6 @@
         jndi = orizniJNDI(jndi);
         DataSource zdroj = null;
         try {
-            System.out.println("XXXXXX:" + jndi + ":XXXXX");
             zdroj = (DataSource) kontext.lookup(jndi);
             return zdroj.getConnection();
         } catch (NamingException ex) {
diff -r b5dd3de618cd -r 90dc76051e56 java/HrisniciSpameri/web/funkce.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/HrisniciSpameri/web/funkce.js	Fri Feb 13 00:26:59 2009 +0100
@@ -0,0 +1,13 @@
+function zobrazNeboSkryj(idElementu)
+{
+    prvek = document.getElementById(idElementu);
+
+    if (prvek.style.display == "none" || prvek.style.display == "")
+    {
+        prvek.style.display = "block";
+    }
+    else
+    {
+        prvek.style.display = "none";
+    }
+}
diff -r b5dd3de618cd -r 90dc76051e56 java/HrisniciSpameri/web/index.jsp
--- a/java/HrisniciSpameri/web/index.jsp	Thu Feb 12 21:17:09 2009 +0100
+++ b/java/HrisniciSpameri/web/index.jsp	Fri Feb 13 00:26:59 2009 +0100
@@ -8,6 +8,7 @@
         <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8"/>
         <link href="styl.css" type="text/css" rel="StyleSheet"/>
         <script type="text/javascript" src="tridenitabulky.js"></script>
+        <script type="text/javascript" src="funkce.js"></script>
         <title>Hříšníci spameři</title>
     </head>
     <body>
diff -r b5dd3de618cd -r 90dc76051e56 java/HrisniciSpameri/web/souhrn.jspx
--- a/java/HrisniciSpameri/web/souhrn.jspx	Thu Feb 12 21:17:09 2009 +0100
+++ b/java/HrisniciSpameri/web/souhrn.jspx	Fri Feb 13 00:26:59 2009 +0100
@@ -10,28 +10,47 @@
           version="2.0">
 
     <jsp:useBean id="denniSouhrn" class="cz.frantovo.hrisniciSpameri.DenniSouhrn" scope="page"/>
+    <jsp:setProperty name="denniSouhrn" property="denString" value="${param.den}"/>
+    <jsp:setProperty name="denniSouhrn" property="cilString" value="${param.cil}"/>
 
 
+    <p><a onclick="JavaScript: zobrazNeboSkryj('seznamCilu')" href="#">Seznam cílů</a></p>
+    <div id="seznamCilu">
+        <ul>
+            <c:forEach var="c" items="${denniSouhrn.seznamCilu}">
+                <li>
+                    <c:choose>
+                        <c:when test="${c.url == null}">
+                            <c:out value="${c.nazev}"/>
+                        </c:when>
+                        <c:otherwise>
+                            <a href="${f:escapeXml(c.url)}"><c:out value="${c.nazev}"/></a>
+                        </c:otherwise>
+                    </c:choose>
+                </li>
+            </c:forEach>
+        </ul>
+    </div>
 
 
-    <h2>Seznam cílů</h2>
-    <ul>
-        <c:forEach var="c" items="${denniSouhrn.seznamCilu}">
-            <li>
+    <h2>Denní souhrn</h2>
+    <form action="#" method="get">
+        <input name="den" type="text" value="${denniSouhrn.den}"/>
+        <select name="cil">
+            <option value="0">Všechny cíle</option>
+            <c:forEach var="c" items="${denniSouhrn.seznamCilu}">
                 <c:choose>
-                    <c:when test="${c.url == null}">
-                        <c:out value="${c.nazev}"/>
+                    <c:when test="${c.id == denniSouhrn.cil}">
+                        <option value="${c.id}" selected="selected"><c:out value="${c.nazev}"/></option>
                     </c:when>
                     <c:otherwise>
-                        <a href="${f:escapeXml(c.url)}"><c:out value="${c.nazev}"/></a>
+                        <option value="${c.id}"><c:out value="${c.nazev}"/></option>
                     </c:otherwise>
                 </c:choose>
-            </li>
-        </c:forEach>
-    </ul>
-
-
-    <h2>Denní souhrn</h2>
+            </c:forEach>
+        </select>
+        <button>Zobrazit</button>
+    </form>
 
     <table class="sortable" id="seznamHrisniku">
         <thead>
diff -r b5dd3de618cd -r 90dc76051e56 java/HrisniciSpameri/web/styl.css
--- a/java/HrisniciSpameri/web/styl.css	Thu Feb 12 21:17:09 2009 +0100
+++ b/java/HrisniciSpameri/web/styl.css	Fri Feb 13 00:26:59 2009 +0100
@@ -34,4 +34,8 @@
     margin-bottom: 1em;
     text-align: center;
     background-color: #e6e6e6;
+}
+
+#seznamCilu {
+    display: none;
 }
\ No newline at end of file