aa7039e90462ab91 Missing cell borders for CDR table on session page
authorTomas Zeman <tzeman@volny.cz>
Thu, 14 Apr 2011 15:35:45 +0200
changeset 17 edb9bd4db3bb
parent 16 930d0b9e5169
child 18 a19b95b09409
aa7039e90462ab91 Missing cell borders for CDR table on session page
src/main/scala/radview/snippet/SessionSnippet.scala
src/main/webapp/session.html
--- a/src/main/scala/radview/snippet/SessionSnippet.scala	Thu Apr 14 15:35:44 2011 +0200
+++ b/src/main/scala/radview/snippet/SessionSnippet.scala	Thu Apr 14 15:35:45 2011 +0200
@@ -23,7 +23,7 @@
 import net.liftweb.sitemap.Loc._
 import net.liftweb.util._
 import net.liftweb.util.{Cell => _}
-import net.liftweb.util.Helpers.{boolean2, urlEncode}
+import net.liftweb.util.Helpers._
 import net.tz.lift.snippet._
 import net.tz.lift.util._
 import radview.model.{Cdr, CdrSession, Cell}
@@ -68,12 +68,19 @@
 
   override def snippets: SnippetTest = {
     case ("panel", Full(s)) => SessionPanel(s)
-    case ("cdr-list", Full(s)) if showCdr => CdrTable(s)
+    case ("cdr-list", Full(s)) if showCdr => cdrList(s)
 
     case ("panel", _) => ClearNodes
     case ("cdr-list", _) => ClearNodes
   }
 
+  def cdrList(s: CdrSession) = {
+    val cdrs = Cdr.bySession(s)
+    ".num-rows-panel" #> Panel(List(AttrRow(Text("CDR records"),
+        Text(cdrs.size.toString)))) &
+    ".list" #> CdrTable(cdrs, s.cell.isEmpty)
+  }
+
 }
 
 object SessionPanel {
@@ -166,9 +173,6 @@
     })
     Table[Cdr](cols, cdr)
   }
-
-  def apply(s: CdrSession): (NodeSeq => NodeSeq) = apply(bySession(s),
-    s.cell.isEmpty)
 }
 
 // vim: set ts=2 sw=2 et:
--- a/src/main/webapp/session.html	Thu Apr 14 15:35:44 2011 +0200
+++ b/src/main/webapp/session.html	Thu Apr 14 15:35:45 2011 +0200
@@ -14,8 +14,9 @@
       </div>
       <div class="span-14 last">
       </div>
-      <div class="span-24 last">
-        <span class="lift:cdr-list"/>
+      <div class="span-24 last lift:cdr-list">
+        <span class="num-rows-panel"/><br/>
+        <span class="list"/>
       </div>
     </div>
   </body>